Correct SPDX-License-Identifier

pshipton · pshipton · commit 5852eec67a31 · 2023-06-09T13:56:33.000-04:00
Issue eclipse-openj9/openj9#17429 Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -17,7 +17,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
 ###############################################################################
 name: "nightly build-openj9"
 on:
diff --git a/.gitignore b/.gitignore
@@ -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
 
 # Dependency directory
 node_modules
diff --git a/NOTICE.md b/NOTICE.md
@@ -22,14 +22,12 @@ https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 which
 is available at https://www.apache.org/licenses/LICENSE-2.0. This Source Code
 may also be made available under the following Secondary Licenses when the
 conditions for such availability set forth in the Eclipse Public License v. 2.0
-are satisfied: GPL-2.0 with Assembly Exception which is available at
-https://openjdk.java.net/legal/assembly-exception.html, and (secondary) GPL-2.0
-with Classpath-exception-2.0 which is available at GNU General Public License
-v2.0 w/Classpath exception',
-'https://www.gnu.org/software/classpath/license.html.
+are satisfied: GPL-2.0 with Classpath-exception-2.0 which is available at
+https://openjdk.java.net/legal/gplv2+ce.html, and GPL-2.0 with Assembly
+Exception which is available at
+https://openjdk.java.net/legal/assembly-exception.html.
 
-SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH
-OpenJDK-assembly-exception-1.0 OR GPL-2.0-with-classpath-exception
+SPDX-License-Identifier: EPL-2.0 OR 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 Code
 
@@ -95,8 +93,7 @@ dlmalloc (2.8.3)
 
 doxygen (1.8.3.1)
 
-* License: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR
-   LicenseRef-GPL-2.0 WITH Assembly-exception
+* License: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
 * Project: http://doxygen.org
 * Source: ftp://ftp.stack.nl/pub/users/dimitri/Doxygen-1.8.3.1.dmg
 
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2].
 [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
 -->
 
 # Building OpenJDK with OpenJ9
diff --git a/action.yml b/action.yml
@@ -17,7 +17,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
 ###############################################################################
 name: 'build-openj9'
 description: 'Build different version of openjdk with openj9'
diff --git a/dist/index.js b/dist/index.js
@@ -3308,7 +3308,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * [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
  *******************************************************************************/
 const exec = __importStar(__webpack_require__(986));
 const core = __importStar(__webpack_require__(470));
@@ -4760,7 +4760,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * [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
  *******************************************************************************/
 const core = __importStar(__webpack_require__(470));
 const builder = __importStar(__webpack_require__(532));
diff --git a/src/build-openj9.ts b/src/build-openj9.ts
@@ -17,7 +17,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
  *******************************************************************************/
 import * as core from '@actions/core'
 import * as builder from './builder'
diff --git a/src/builder.ts b/src/builder.ts
@@ -17,7 +17,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
  *******************************************************************************/
 import * as exec from '@actions/exec'
 import * as core from '@actions/core'

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`# [1] https://www.gnu.org/software/classpath/license.html`
`18`	`18`	`# [2] http://openjdk.java.net/legal/assembly-exception.html`
`19`	`19`	`#`
`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`
`21`	`21`	`###############################################################################`
`22`	`22`	`name: "nightly build-openj9"`
`23`	`23`	`on:`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`# [1] https://www.gnu.org/software/classpath/license.html`
`17`	`17`	`# [2] http://openjdk.java.net/legal/assembly-exception.html`
`18`	`18`	`#`
`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`
`20`	`20`
`21`	`21`	`# Dependency directory`
`22`	`22`	`node_modules`