Skip to content

Commit 9a12b8a

Browse files
keithc-cakeithc-ca
committed
Correct SPDX license identifiers
* "GPL-2.0" should have been "GPL-2.0-only" * "OpenJDK-assembly-exception-1.0" replaces "Assembly-exception" * 'OR' must be written in upper-case Signed-off-by: Keith W. Campbell <[email protected]>
1 parent ec0eb13 commit 9a12b8a

File tree

9,777 files changed

+9808
-9841
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

9,777 files changed

+9808
-9841
lines changed

‎.gitattributes

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] https://openjdk.org/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2020

2121
# Binary files
2222
*.jpg git-encoding=BINARY working-tree-encoding=BINARY

‎.github/runlint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# [1] https://www.gnu.org/software/classpath/license.html
2020
# [2] https://openjdk.org/legal/assembly-exception.html
2121
#
22-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
22+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2323
###############################################################################
2424

2525
# Exit immediately if any unexpected error occurs.

‎.github/workflows/autoTestPR.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# [1] https://www.gnu.org/software/classpath/license.html
1818
# [2] https://openjdk.org/legal/assembly-exception.html
1919
#
20-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
20+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2121
###############################################################################/
2222

2323
name: "Auto test PR"

‎.github/workflows/presubmit.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# [1] https://www.gnu.org/software/classpath/license.html
1818
# [2] https://openjdk.org/legal/assembly-exception.html
1919
#
20-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
20+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2121
###############################################################################/
2222

2323
name: Linter

‎.github/workflows/rmAutoTestPRBranch.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# [1] https://www.gnu.org/software/classpath/license.html
1818
# [2] https://openjdk.org/legal/assembly-exception.html
1919
#
20-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
20+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2121
###############################################################################/
2222

2323
name: "Remove autoTestPR branch"

‎.github/workflows/runAqa.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# [1] https://www.gnu.org/software/classpath/license.html
1818
# [2] https://openjdk.org/legal/assembly-exception.html
1919
#
20-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
20+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2121
###############################################################################/
2222

2323
name: "PR Comment Build Action for openj9"

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] https://openjdk.org/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2020

2121
*.jar
2222
*.zip

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# [1] https://www.gnu.org/software/classpath/license.html
1818
# [2] https://openjdk.org/legal/assembly-exception.html
1919
#
20-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
20+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2121
################################################################################
2222

2323
cmake_minimum_required(VERSION 3.4 FATAL_ERROR)

‎CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2].
1717
[1] https://www.gnu.org/software/classpath/license.html
1818
[2] https://openjdk.org/legal/assembly-exception.html
1919
20-
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
20+
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2121
-->
2222

2323
# Contributing to Eclipse OpenJ9
@@ -241,6 +241,6 @@ The template for the copyright notice and dual-license is as follows:
241241
* [1] https://www.gnu.org/software/classpath/license.html
242242
* [2] https://openjdk.org/legal/assembly-exception.html
243243
*
244-
* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
244+
* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
245245
*******************************************************************************/
246246
```

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ This Source Code may also be made available under the following Secondary Licens
99
[1] https://www.gnu.org/software/classpath/license.html
1010
[2] https://openjdk.org/legal/assembly-exception.html
1111

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

1414
Subject to the following notices:
1515

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2].
1717
[1] https://www.gnu.org/software/classpath/license.html
1818
[2] https://openjdk.org/legal/assembly-exception.html
1919
20-
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
20+
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2121
-->
2222

2323
<p align="center">

‎about.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ <h3>License</h3>
2323
<p>
2424
[1] <a href="https://www.gnu.org/software/classpath/license.html">https://www.gnu.org/software/classpath/license.html</a><br>
2525
[2] <a href="https://openjdk.org/legal/assembly-exception.html">https://openjdk.org/legal/assembly-exception.html</a><br><br>
26-
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
26+
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2727
</p>
2828

2929
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by

‎buildenv/Build_Instructions_V11.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2].
1717
[1] https://www.gnu.org/software/classpath/license.html
1818
[2] https://openjdk.org/legal/assembly-exception.html
1919
20-
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
20+
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2121
-->
2222

2323
This document has moved to the `/doc` folder. Click [here](../doc/build-instructions/Build_Instructions_V11.md) to access the document.

‎buildenv/Build_Instructions_V8.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2].
1717
[1] https://www.gnu.org/software/classpath/license.html
1818
[2] https://openjdk.org/legal/assembly-exception.html
1919
20-
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
20+
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2121
-->
2222

2323
This document has moved to the `/doc` folder. Click [here](../doc/build-instructions/Build_Instructions_V8.md) to access the document.

‎buildenv/aix/jdk11/yum_install_aix-ppc64.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] https://openjdk.org/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2020

2121
# This file installs package dependencies for building OpenJDK V11 with OpenJ9 on AIX 64-bit systems
2222
# To use this file, specify `yum shell yum_install_aix-ppc64.txt`

‎buildenv/aix/jdk17/yum_install_aix-ppc64.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] https://openjdk.org/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2020

2121
# This file installs package dependencies for building OpenJDK V17 with OpenJ9 on AIX 64-bit systems
2222
# To use this file, specify `yum shell yum_install_aix-ppc64.txt`

‎buildenv/aix/jdk19/yum_install_aix-ppc64.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] https://openjdk.org/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2020

2121
# This file installs package dependencies for building OpenJDK V18 with OpenJ9 on AIX 64-bit systems
2222
# To use this file, specify `yum shell yum_install_aix-ppc64.txt`

‎buildenv/aix/jdk20/yum_install_aix-ppc64.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] https://openjdk.org/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2020

2121
# This file installs package dependencies for building OpenJDK V18 with OpenJ9 on AIX 64-bit systems
2222
# To use this file, specify `yum shell yum_install_aix-ppc64.txt`

‎buildenv/aix/jdk8/yum_install_aix-ppc64.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] https://openjdk.org/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2020

2121
# This file installs package dependencies for building OpenJDK V8 with OpenJ9 on AIX 64-bit systems
2222
# To use this file, specify `yum shell yum_install_aix-ppc64.txt`

‎buildenv/ansible/inventories/local/hosts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# [1] https://www.gnu.org/software/classpath/license.html
1818
# [2] https://openjdk.org/legal/assembly-exception.html
1919
#
20-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
20+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2121
###############################################################################
2222
all:
2323
vars:

‎buildenv/ansible/openj9-docker-image.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# [1] https://www.gnu.org/software/classpath/license.html
1818
# [2] https://openjdk.org/legal/assembly-exception.html
1919
#
20-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
20+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2121
###############################################################################
2222
---
2323
# This playbook builds the OpenJ9 JVM and publishes it as a Docker image

‎buildenv/ansible/roles/openj9-build-environment/tasks/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# [1] https://www.gnu.org/software/classpath/license.html
1818
# [2] https://openjdk.org/legal/assembly-exception.html
1919
#
20-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
20+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2121
###############################################################################
2222
# Copyright IBM Corp. and others 2020
2323
###############################################################################

‎buildenv/ansible/roles/openj9-cleanup-build-environment/tasks/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# [1] https://www.gnu.org/software/classpath/license.html
1818
# [2] https://openjdk.org/legal/assembly-exception.html
1919
#
20-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
20+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2121
###############################################################################
2222
# Copyright IBM Corp. and others 2020
2323
###############################################################################

‎buildenv/ansible/roles/openj9-from-sources/tasks/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# [1] https://www.gnu.org/software/classpath/license.html
1818
# [2] https://openjdk.org/legal/assembly-exception.html
1919
#
20-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
20+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2121
###############################################################################
2222
---
2323
- name: Checkout ibmruntimes

‎buildenv/ansible/roles/openj9-image/files/Dockerfile-ubuntu

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# [1] https://www.gnu.org/software/classpath/license.html
1818
# [2] https://openjdk.org/legal/assembly-exception.html
1919
#
20-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
20+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2121
###############################################################################
2222

2323
FROM ubuntu:16.04

‎buildenv/ansible/roles/openj9-image/tasks/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# [1] https://www.gnu.org/software/classpath/license.html
1818
# [2] https://openjdk.org/legal/assembly-exception.html
1919
#
20-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
20+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2121
###############################################################################
2222
---
2323
- set_fact:

‎buildenv/docker/.dockerignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] https://openjdk.org/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2020

2121
# Ignore everything except select files.
2222
*

‎buildenv/docker/.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] https://openjdk.org/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2020

2121
/authorized_keys
2222
/known_hosts

‎buildenv/docker/aarch64-linux_CC/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] https://openjdk.org/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2020

2121
# To use this docker file:
2222
# docker build -t=openj9aarch64 .

‎buildenv/docker/armhf-linux_CC/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] https://openjdk.org/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2020

2121
FROM ubuntu:16.04
2222

‎buildenv/docker/mkdocker.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ cat <<- EOF
2020
# [1] https://www.gnu.org/software/classpath/license.html
2121
# [2] https://openjdk.org/legal/assembly-exception.html
2222
#
23-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
23+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2424
EOF
2525
}
2626

‎buildenv/docker/test/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# [1] https://www.gnu.org/software/classpath/license.html
1717
# [2] https://openjdk.org/legal/assembly-exception.html
1818
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2020

2121
# To use this docker file:
2222
# 1.Depends on your OS platform, build the base openj9 docker

‎buildenv/docker/test/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2].
1717
[1] https://www.gnu.org/software/classpath/license.html
1818
[2] https://openjdk.org/legal/assembly-exception.html
1919
20-
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
20+
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2121
-->
2222

2323
# To use this docker file:

‎buildenv/jenkins/ARTIFACTORY.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2].
1717
[1] https://www.gnu.org/software/classpath/license.html
1818
[2] https://openjdk.org/legal/assembly-exception.html
1919
20-
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
20+
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2121
-->
2222
# About
2323
Artifactory is a binary repository manager.

‎buildenv/jenkins/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2].
1717
[1] https://www.gnu.org/software/classpath/license.html
1818
[2] https://openjdk.org/legal/assembly-exception.html
1919
20-
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
20+
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2121
-->
2222

2323
[Eclipse OpenJ9 Jenkins Builds](https://openj9-jenkins.osuosl.org/)

‎buildenv/jenkins/common/build.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* [1] https://www.gnu.org/software/classpath/license.html
1818
* [2] https://openjdk.org/legal/assembly-exception.html
1919
*
20-
* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
20+
* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2121
*******************************************************************************/
2222
import groovy.json.JsonSlurper;
2323
import groovy.json.JsonOutput;

0 commit comments

Comments
 (0)