Skip to content

Commit 21620b1

Browse files
committedJul 5, 2016
Fix Apache License naming as requested by issue #673.
1 parent adb916e commit 21620b1

8 files changed

+10
-9
lines changed
 

‎ASL2.0 ‎AL2.0

File renamed without changes.

‎CHANGES.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
NOTE: as of JNA 4.0, JNA is now dual-licensed under LGPL and ASL (see LICENSE).
1+
NOTE: as of JNA 4.0, JNA is now dual-licensed under LGPL and AL (see LICENSE).
22

33
NOTE: JNI native support is typically incompatible between minor versions, and almost always incompatible between major versions.
44

@@ -72,6 +72,7 @@ Bug Fixes
7272
* [#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)
7373
* [#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).
7474
* [#646](https://github.com/java-native-access/jna/issues/646): `platform.win32.COM.COMBindingBaseObject` swallows reason if instantiation fails - [@matthiasblaesing](https://github.com/matthiasblaesing).
75+
* [#647](https://github.com/java-native-access/jna/pull/647): Update references to Apache License as requested by issue #673 [@bhamail](https://github.com/bhamail)
7576
* [#636](https://github.com/java-native-access/jna/issues/636); Staticly link visual c++ runtime when building with MSVC - [@matthiasblaesing](https://github.com/matthiasblaesing).
7677

7778
Release 4.2.1

‎LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ A copy is also included in the downloadable source code package
1313
containing JNA, in file "LGPL2.1", under the same directory
1414
as this file.
1515

16-
You may obtain a copy of the ASL License at:
16+
You may obtain a copy of the AL License at:
1717

1818
http://www.apache.org/licenses/
1919

2020
A copy is also included in the downloadable source code package
21-
containing JNA, in file "ASL2.0", under the same directory
21+
containing JNA, in file "AL2.0", under the same directory
2222
as this file.

‎LICENSE.ASL ‎LICENSE.AL

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ You may obtain a copy of the License at:
88
http://www.apache.org/licenses/
99

1010
A copy is also included in the downloadable source code package
11-
containing JNA, in file "ASL2.0", under the same directory
11+
containing JNA, in file "AL2.0", under the same directory
1212
as this file.

‎build.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1143,7 +1143,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
11431143
<!-- Javadoc -->
11441144
<!-- JNA sources only, for use in Linux build from source/shared libffi -->
11451145
<zip zipfile="${dist}/src.zip">
1146-
<zipfileset dir="." includes="build.xml,${pom},LICENSE,LGPL2.1,ASL2.0"/>
1146+
<zipfileset dir="." includes="build.xml,${pom},LICENSE,LGPL2.1,AL2.0"/>
11471147
<zipfileset dir="${src}" includes="**/*.java" prefix="src"/>
11481148
<zipfileset dir="${test.src}" includes="**/*.java" prefix="test"/>
11491149
<zipfileset dir="${native}" excludes="libffi,libffi/**/*,build,build/**/*" prefix="native"/>

‎parent/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<distribution>repo</distribution>
1919
</license>
2020
<license>
21-
<name>ASL, version 2</name>
21+
<name>AL v2.0</name>
2222
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
2323
<distribution>repo</distribution>
2424
</license>

‎pom-jna-platform.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<distribution>repo</distribution>
2121
</license>
2222
<license>
23-
<name>ASL, version 2</name>
23+
<name>AL v2.0</name>
2424
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
2525
<distribution>repo</distribution>
2626
</license>

‎pom-jna.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<distribution>repo</distribution>
2121
</license>
2222
<license>
23-
<name>ASL, version 2</name>
23+
<name>AL v2.0</name>
2424
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
2525
<distribution>repo</distribution>
2626
</license>
@@ -50,4 +50,4 @@
5050
</developer>
5151
</developers>
5252

53-
</project>
53+
</project>

0 commit comments

Comments
 (0)
Please sign in to comment.