cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject cxf-fediz git commit: Adding bouncycastle/slf4j licenses
Date Wed, 10 May 2017 12:05:34 GMT
Repository: cxf-fediz
Updated Branches:
  refs/heads/1.2.x-fixes 650519789 -> 5fa238fbc


Adding bouncycastle/slf4j licenses


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/5fa238fb
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/5fa238fb
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/5fa238fb

Branch: refs/heads/1.2.x-fixes
Commit: 5fa238fbce584c36ceed53e35357cc6f4de41f04
Parents: 6505197
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Wed May 10 13:04:38 2017 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Wed May 10 13:05:27 2017 +0100

----------------------------------------------------------------------
 apache-fediz/src/assembly/bin.xml               |  1 +
 apache-fediz/src/main/release/LICENSE           | 10 ++++++++++
 .../release/licenses/LICENSE-bouncycastle.txt   |  7 +++++++
 .../src/main/release/licenses/LICENSE-slf4j.txt | 21 ++++++++++++++++++++
 4 files changed, 39 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/5fa238fb/apache-fediz/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/apache-fediz/src/assembly/bin.xml b/apache-fediz/src/assembly/bin.xml
index 767de09..33e92d8 100644
--- a/apache-fediz/src/assembly/bin.xml
+++ b/apache-fediz/src/assembly/bin.xml
@@ -32,6 +32,7 @@
             <outputDirectory>apache-fediz-${project.version}</outputDirectory>
             <includes>
                 <include>*</include>
+                <include>licenses/*</include>
             </includes>
         </fileSet>
         <fileSet>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/5fa238fb/apache-fediz/src/main/release/LICENSE
----------------------------------------------------------------------
diff --git a/apache-fediz/src/main/release/LICENSE b/apache-fediz/src/main/release/LICENSE
index d645695..ad516d4 100644
--- a/apache-fediz/src/main/release/LICENSE
+++ b/apache-fediz/src/main/release/LICENSE
@@ -200,3 +200,13 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+Apache CXF Fediz includes a number of components and libraries with separate
+copyright notices and license terms. Your use of those components are subject
+to the terms and conditions of the following licenses.
+
+This project bundles SLF4J (MIT license):
+ - See licenses/LICENSE-slf4j.txt
+
+This project bundles BouncyCastle (MIT license):
+ - See licenses/LICENSE-bouncycastle.txt 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/5fa238fb/apache-fediz/src/main/release/licenses/LICENSE-bouncycastle.txt
----------------------------------------------------------------------
diff --git a/apache-fediz/src/main/release/licenses/LICENSE-bouncycastle.txt b/apache-fediz/src/main/release/licenses/LICENSE-bouncycastle.txt
new file mode 100644
index 0000000..201693c
--- /dev/null
+++ b/apache-fediz/src/main/release/licenses/LICENSE-bouncycastle.txt
@@ -0,0 +1,7 @@
+Copyright (c) 2000 - 2017 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software
and associated documentation files (the "Software"), to deal in the Software without restriction,
including without limitation the rights to use, copy, modify, merge, publish, distribute,
sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/5fa238fb/apache-fediz/src/main/release/licenses/LICENSE-slf4j.txt
----------------------------------------------------------------------
diff --git a/apache-fediz/src/main/release/licenses/LICENSE-slf4j.txt b/apache-fediz/src/main/release/licenses/LICENSE-slf4j.txt
new file mode 100644
index 0000000..744377c
--- /dev/null
+++ b/apache-fediz/src/main/release/licenses/LICENSE-slf4j.txt
@@ -0,0 +1,21 @@
+Copyright (c) 2004-2017 QOS.ch
+All rights reserved.
+
+Permission is hereby granted, free  of charge, to any person obtaining
+a  copy  of this  software  and  associated  documentation files  (the
+"Software"), to  deal in  the Software without  restriction, including
+without limitation  the rights to  use, copy, modify,  merge, publish,
+distribute,  sublicense, and/or sell  copies of  the Software,  and to
+permit persons to whom the Software  is furnished to do so, subject to
+the following conditions:
+
+The  above  copyright  notice  and  this permission  notice  shall  be
+included in all copies or substantial portions of the Software.
+
+THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


Mime
View raw message