Skip to content

Commit 4e4c71a

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" Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
1 parent a4ee8e0 commit 4e4c71a

File tree

3,263 files changed

+3309
-3313
lines changed

Some content is hidden

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

3,263 files changed

+3309
-3313
lines changed

‎.gitignore

+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
build/

‎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
# TODO: OMR_RTTI flag

‎CODEOWNERS

+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
# Global project leads/owners

‎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 OMR
@@ -389,6 +389,6 @@ The template for the copyright notice and dual-license is as follows:
389389
* [1] https://www.gnu.org/software/classpath/license.html
390390
* [2] https://openjdk.org/legal/assembly-exception.html
391391
*
392-
* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
392+
* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
393393
*******************************************************************************/
394394
```

‎GNUmakefile

+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
top_srcdir := .

‎INSTALL

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ OpenJDK Assembly Exception [2].
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

2222
Building OMR

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ with the GNU Classpath Exception [1] and GNU General Public License, version 2 w
1313
[1] https://www.gnu.org/software/classpath/license.html
1414
[2] https://openjdk.org/legal/assembly-exception.html
1515

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

1818
Subject to the following notices:
1919

‎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 OMR

‎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

‎azure-pipelines.yml

+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

2222
trigger:

‎buildenv/docker/doBuild.sh

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

2323

2424
cd $OMRDIR

‎buildenv/docker/x86_64/ubuntu20/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
# Create the OMR build environment with Ubuntu 20.04.
2222

‎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 OMR Jenkins Builds](https://ci.eclipse.org/omr/)

‎buildenv/jenkins/omrbuild.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

2323
defaultCompile = 'make -j4'

‎buildenv/jenkins/refRepoUpdater.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

2323
LABEL = (params.LABEL) ? params.LABEL : '!zOS&&!master&&!proxy'

‎cmake/CheckSourceTree.cmake

+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

2222
# Ensure the source tree hasn't been used for building before.

‎cmake/caches/GcApi.cmake

+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

2222
# A cache for enabling the extended GC APIs

‎cmake/caches/Travis.cmake

+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

2222
set(OMR_COMPILER ON CACHE BOOL "")

‎cmake/caches/Windows.cmake

+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

2222
set(OMR_COMPILER ON CACHE BOOL "")

‎cmake/config.cmake

+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

2222
set(OMR_WARNINGS_AS_ERRORS ON CACHE BOOL "Treat compile warnings as errors")

‎cmake/modules/FindDiaSDK.cmake

+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

2222
# Find DIA SDK

‎cmake/modules/FindLibDwarf.cmake

+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

2222
# Find libdwarf.

‎cmake/modules/FindLibElf.cmake

+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

2222
# Find libelf

‎cmake/modules/FindLibZ.cmake

+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

2222
# Find libz

‎cmake/modules/FindOmrCuda.cmake

+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

2222
# This module locates a minimal set of cuda headers, required by the OMR_OPT_CUDA flag.

‎cmake/modules/OmrAssert.cmake

+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

2222
# Include once

‎cmake/modules/OmrCompilerSupport.cmake

+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

2222
# Include once

‎cmake/modules/OmrCrossCompile.cmake

+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

2222
if(OMR_CROSS_COMPILE_)

‎cmake/modules/OmrDDRSupport.cmake

+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

2222
if(_OMR_DDR_SUPPORT)

‎cmake/modules/OmrDetectSystemInformation.cmake

+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

2222
include(CheckSymbolExists)

‎cmake/modules/OmrFindFiles.cmake

+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

2222
include(OmrAssert)

‎cmake/modules/OmrHookgen.cmake

+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

2222
if(OMR_HOOKGEN_)

‎cmake/modules/OmrMetalC.cmake

+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
# Include once.

‎cmake/modules/OmrMsvcRuntime.cmake

+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
# Find the MSVC Runtime libraries.

‎cmake/modules/OmrOption.cmake

+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

2222
#[==========[ .rst

‎cmake/modules/OmrPlatform.cmake

+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

2222
if(OMR_PLATFORM_)

‎cmake/modules/OmrSanitizerSupport.cmake

+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
include(OmrUtility)

0 commit comments

Comments
 (0)