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 <keithc@ca.ibm.com>
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

0 commit comments

Comments
 (0)