Don't package JSR in binary distribution, move LICENSE/NOTICE files to the top directory for ease of access
This closes #60 from GitHub.
Signed-off-by: anew <anew@apache.org>
diff --git a/licenses/JSR.LGPL b/licenses/JSR.LGPL
deleted file mode 100644
index 65c5ca8..0000000
--- a/licenses/JSR.LGPL
+++ /dev/null
@@ -1,165 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
- This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
- 0. Additional Definitions.
-
- As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
- "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
- An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
- A "Combined Work" is a work produced by combining or linking an
-Application with the Library. The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
- The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
- The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
- 1. Exception to Section 3 of the GNU GPL.
-
- You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
- 2. Conveying Modified Versions.
-
- If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
- a) under this License, provided that you make a good faith effort to
- ensure that, in the event an Application does not supply the
- function or data, the facility still operates, and performs
- whatever part of its purpose remains meaningful, or
-
- b) under the GNU GPL, with none of the additional permissions of
- this License applicable to that copy.
-
- 3. Object Code Incorporating Material from Library Header Files.
-
- The object code form of an Application may incorporate material from
-a header file that is part of the Library. You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
- a) Give prominent notice with each copy of the object code that the
- Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the object code with a copy of the GNU GPL and this license
- document.
-
- 4. Combined Works.
-
- You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
- a) Give prominent notice with each copy of the Combined Work that
- the Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the Combined Work with a copy of the GNU GPL and this license
- document.
-
- c) For a Combined Work that displays copyright notices during
- execution, include the copyright notice for the Library among
- these notices, as well as a reference directing the user to the
- copies of the GNU GPL and this license document.
-
- d) Do one of the following:
-
- 0) Convey the Minimal Corresponding Source under the terms of this
- License, and the Corresponding Application Code in a form
- suitable for, and under terms that permit, the user to
- recombine or relink the Application with a modified version of
- the Linked Version to produce a modified Combined Work, in the
- manner specified by section 6 of the GNU GPL for conveying
- Corresponding Source.
-
- 1) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (a) uses at run time
- a copy of the Library already present on the user's computer
- system, and (b) will operate properly with a modified version
- of the Library that is interface-compatible with the Linked
- Version.
-
- e) Provide Installation Information, but only if you would otherwise
- be required to provide such information under section 6 of the
- GNU GPL, and only to the extent that such information is
- necessary to install and execute a modified version of the
- Combined Work produced by recombining or relinking the
- Application with a modified version of the Linked Version. (If
- you use option 4d0, the Installation Information must accompany
- the Minimal Corresponding Source and Corresponding Application
- Code. If you use option 4d1, you must provide the Installation
- Information in the manner specified by section 6 of the GNU GPL
- for conveying Corresponding Source.)
-
- 5. Combined Libraries.
-
- You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
- a) Accompany the combined library with a copy of the same work based
- on the Library, uncombined with any other library facilities,
- conveyed under the terms of this License.
-
- b) Give prominent notice with the combined library that part of it
- is a work based on the Library, and explaining where to find the
- accompanying uncombined form of the same work.
-
- 6. Revised Versions of the GNU Lesser General Public License.
-
- The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
- If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
diff --git a/pom.xml b/pom.xml
index 3eecde7..634d9f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -201,6 +201,7 @@
<!-- Dependencies versions -->
<fastutil.version>6.5.6</fastutil.version>
+ <findbugs.jsr305.version>2.0.1</findbugs.jsr305.version>
<gson.version>2.2.4</gson.version>
<guava.version>13.0.1</guava.version>
<guice.version>3.0</guice.version>
@@ -224,6 +225,13 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>${findbugs.jsr305.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
@@ -436,6 +444,7 @@
<exclude>**/.classpath</exclude>
<exclude>**/.settings/**</exclude>
<exclude>licenses/**</exclude>
+ <exclude>**/NOTICE_BINARY</exclude>
</excludes>
</configuration>
</execution>
diff --git a/src/assemble/bin.xml b/src/assemble/bin.xml
index 4874cc6..b9655ed 100644
--- a/src/assemble/bin.xml
+++ b/src/assemble/bin.xml
@@ -61,18 +61,24 @@
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
- <directory>${project.basedir}/../tephra-distribution</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../licenses</directory>
+ <directory>${project.basedir}/../tephra-distribution/licenses</directory>
<outputDirectory>licenses</outputDirectory>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
</fileSet>
</fileSets>
+
+ <files>
+ <file>
+ <source>${project.basedir}/../tephra-distribution/LICENSE_BINARY</source>
+ <outputDirectory>.</outputDirectory>
+ <destName>LICENSE</destName>
+ </file>
+ <file>
+ <source>${project.basedir}/../tephra-distribution/NOTICE_BINARY</source>
+ <outputDirectory>.</outputDirectory>
+ <destName>NOTICE</destName>
+ </file>
+ </files>
+
</assembly>
diff --git a/tephra-api/pom.xml b/tephra-api/pom.xml
index 1d0cbe6..2bbc829 100644
--- a/tephra-api/pom.xml
+++ b/tephra-api/pom.xml
@@ -30,4 +30,11 @@
<name>Apache Tephra API</name>
<description>Apache Tephra Transaction System API Module</description>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </dependency>
+ </dependencies>
+
</project>
diff --git a/tephra-distribution/LICENSE b/tephra-distribution/LICENSE_BINARY
similarity index 98%
rename from tephra-distribution/LICENSE
rename to tephra-distribution/LICENSE_BINARY
index bfbf0c0..5803ce1 100644
--- a/tephra-distribution/LICENSE
+++ b/tephra-distribution/LICENSE_BINARY
@@ -232,7 +232,4 @@
This product bundles JLine v0.9.94, which is available under a BSD license.
For details, see licenses/JLine.BSD
-This product bundles FindBugs JSR305 v2.0.1 which is available under a LGP License.
-For details, see licenses/JSR.LGPL
-
******************************************
\ No newline at end of file
diff --git a/tephra-distribution/NOTICE b/tephra-distribution/NOTICE_BINARY
similarity index 100%
rename from tephra-distribution/NOTICE
rename to tephra-distribution/NOTICE_BINARY
diff --git a/tephra-distribution/README b/tephra-distribution/README
new file mode 100644
index 0000000..042be1b
--- /dev/null
+++ b/tephra-distribution/README
@@ -0,0 +1 @@
+Apache Tephra does not distribute any binary distributions. If users choose to build the Apache Tephra distribution, third party libraries might be included as part of the distribution. LICENSE_BINARY and NOTICE_BINARY contains information on those libraries and their licenses.
diff --git a/licenses/Aopa.PL b/tephra-distribution/licenses/Aopa.PL
similarity index 100%
rename from licenses/Aopa.PL
rename to tephra-distribution/licenses/Aopa.PL
diff --git a/licenses/Asm.BSD b/tephra-distribution/licenses/Asm.BSD
similarity index 100%
rename from licenses/Asm.BSD
rename to tephra-distribution/licenses/Asm.BSD
diff --git a/licenses/JLine.BSD b/tephra-distribution/licenses/JLine.BSD
similarity index 100%
rename from licenses/JLine.BSD
rename to tephra-distribution/licenses/JLine.BSD
diff --git a/licenses/Logback.EPL b/tephra-distribution/licenses/Logback.EPL
similarity index 100%
rename from licenses/Logback.EPL
rename to tephra-distribution/licenses/Logback.EPL
