Merge pull request #674 from bhamail/ApacheLicense-naming

Fix Apache License naming as requested by issue #673.
java-native-access · Jul 5, 2016 · 3217e0e · 3217e0e
2 parents adb916e + 090bffc
commit 3217e0e
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git a/ASL2.0 → AL2.0 b/ASL2.0 → AL2.0
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,4 @@
-NOTE: as of JNA 4.0, JNA is now dual-licensed under LGPL and ASL (see LICENSE).
+NOTE: as of JNA 4.0, JNA is now dual-licensed under LGPL and AL 2.0 (see LICENSE).
 
 NOTE: JNI native support is typically incompatible between minor versions, and almost always incompatible between major versions.
 
@@ -72,6 +72,7 @@ Bug Fixes
 * [#633](https://github.com/java-native-access/jna/pull/633): Restore default usage of platform native encoding for Java strings passed to native functions (was hard-coded to UTF-8 in 4.0 and later) [@amake](https://github.com/amake)
 * [#634](https://github.com/java-native-access/jna/pull/634): Improve BSTR handling and add `SysStringByteLen` and `SysStringLen` to `com.sun.jna.platform.win32.OleAuto` - [@matthiasblaesing](https://github.com/matthiasblaesing).
 * [#646](https://github.com/java-native-access/jna/issues/646): `platform.win32.COM.COMBindingBaseObject` swallows reason if instantiation fails - [@matthiasblaesing](https://github.com/matthiasblaesing).
+* [#674](https://github.com/java-native-access/jna/pull/674): Update references to Apache License as requested by issue #673 [@bhamail](https://github.com/bhamail)
 * [#636](https://github.com/java-native-access/jna/issues/636); Staticly link visual c++ runtime when building with MSVC - [@matthiasblaesing](https://github.com/matthiasblaesing).
 
 Release 4.2.1

diff --git a/LICENSE b/LICENSE
@@ -13,10 +13,10 @@ A copy is also included in the downloadable source code package
 containing JNA, in file "LGPL2.1", under the same directory
 as this file.
 
-You may obtain a copy of the ASL License at:
+You may obtain a copy of the Apache License at:
 
 http://www.apache.org/licenses/
 
 A copy is also included in the downloadable source code package
-containing JNA, in file "ASL2.0", under the same directory
+containing JNA, in file "AL2.0", under the same directory
 as this file.
diff --git a/LICENSE.ASL → LICENSE.AL b/LICENSE.ASL → LICENSE.AL
@@ -8,5 +8,5 @@ You may obtain a copy of the License at:
 http://www.apache.org/licenses/
 
 A copy is also included in the downloadable source code package
-containing JNA, in file "ASL2.0", under the same directory
+containing JNA, in file "AL2.0", under the same directory
 as this file.
diff --git a/build.xml b/build.xml
@@ -1143,7 +1143,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
     <!-- Javadoc -->
     <!-- JNA sources only, for use in Linux build from source/shared libffi -->
     <zip zipfile="${dist}/src.zip">
-      <zipfileset dir="." includes="build.xml,${pom},LICENSE,LGPL2.1,ASL2.0"/>
+      <zipfileset dir="." includes="build.xml,${pom},LICENSE,LGPL2.1,AL2.0"/>
       <zipfileset dir="${src}" includes="**/*.java" prefix="src"/>
       <zipfileset dir="${test.src}" includes="**/*.java" prefix="test"/>
       <zipfileset dir="${native}" excludes="libffi,libffi/**/*,build,build/**/*" prefix="native"/>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -18,7 +18,7 @@
             <distribution>repo</distribution>
         </license>
         <license>
-            <name>ASL, version 2</name>
+            <name>Apache License v2.0</name>
             <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
             <distribution>repo</distribution>
         </license>

diff --git a/pom-jna-platform.xml b/pom-jna-platform.xml
@@ -20,7 +20,7 @@
           <distribution>repo</distribution>
       </license>
       <license>
-          <name>ASL, version 2</name>
+          <name>Apache License v2.0</name>
           <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
           <distribution>repo</distribution>
       </license>

diff --git a/pom-jna.xml b/pom-jna.xml
@@ -20,7 +20,7 @@
           <distribution>repo</distribution>
       </license>
       <license>
-          <name>ASL, version 2</name>
+          <name>Apache License v2.0</name>
           <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
           <distribution>repo</distribution>
       </license>
@@ -50,4 +50,4 @@
     </developer>
   </developers>
 
-</project>
+</project>