From 4233f045bfa883950e8f45bc11af0ac874b3580d Mon Sep 17 00:00:00 2001 From: dblock Date: Thu, 11 Feb 2021 10:03:46 -0500 Subject: [PATCH] Clarified dual license and added SPDX-License-Identifier. --- LICENSE | 14 +++++++++----- README.md | 6 +++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/LICENSE b/LICENSE index 304c6b5930..c5a025f0c3 100644 --- a/LICENSE +++ b/LICENSE @@ -1,9 +1,10 @@ -Java Native Access project (JNA) is dual-licensed under 2 -alternative Open Source/Free licenses: LGPL 2.1 or later and -Apache License 2.0. (starting with JNA version 4.0.0). +SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1 -You can freely decide which license you want to apply to -the project. +Java Native Access (JNA) is licensed under the LGPL, version 2.1 +or later, or (from version 4.0 onward) the Apache License, +version 2.0. + +You can freely decide which license you want to apply to the project. You may obtain a copy of the LGPL License at: @@ -20,3 +21,6 @@ http://www.apache.org/licenses/ A copy is also included in the downloadable source code package containing JNA, in file "AL2.0", under the same directory as this file. + +Commercial support may be available, please e-mail +twall[at]users[dot]sf[dot]net. diff --git a/README.md b/README.md index a6939a9664..a386a93962 100644 --- a/README.md +++ b/README.md @@ -78,8 +78,8 @@ JNA Platform [![Maven Central](https://img.shields.io/maven-central/v/net.java.dev.jna/jna-platform.svg?label=Maven%20Central)](https://search.maven.org/artifact/net.java.dev.jna/jna-platform/5.7.0/jar) [jna-platform-5.7.0.jar](https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform/5.7.0/jna-platform-5.7.0.jar) [jna-platform-5.7.0-jpms.jar](https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform/5.7.0/jna-platform-5.7.0-jpms.jar) -This artifact holds cross-platform mappings and mappings for a number of commonly used platform -functions, including a large number of Win32 mappings as well as a set of utility classes +This artifact holds cross-platform mappings and mappings for a number of commonly used platform +functions, including a large number of Win32 mappings as well as a set of utility classes that simplify native access. The code is tested and the utility interfaces ensure that native memory management is taken care of correctly. @@ -174,7 +174,7 @@ If you are interested in paid support, feel free to say so on the [jna-users mai License ======= -This library is licensed under the LGPL, version 2.1 or later, and (from version 4.0 onward) the Apache Software License, version 2.0. Commercial license arrangements are negotiable. +This library is licensed under the LGPL, version 2.1 or later, or (from version 4.0 onward) the Apache License, version 2.0. Commercial support may be available, please e-mail twall[at]users[dot]sf[dot]net. See [LICENSE](LICENSE) for more information. *NOTE: Oracle is not sponsoring this project, even though the package name (com.sun.jna) might imply otherwise.*