You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2018/09/20 10:25:08 UTC
[directory-ldap-api] branch master updated: o Updated the copyright
date o Removed the ant reference o Updated the slf4j license version and
copyright date o Added the xpp 3 license
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-ldap-api.git
The following commit(s) were added to refs/heads/master by this push:
new f15cea4 o Updated the copyright date o Removed the ant reference o Updated the slf4j license version and copyright date o Added the xpp 3 license
f15cea4 is described below
commit f15cea467335ef1f926108aa2f062b7aafd12800
Author: Emmanuel Lécharny <el...@symas.com>
AuthorDate: Thu Sep 20 12:25:07 2018 +0200
o Updated the copyright date
o Removed the ant reference
o Updated the slf4j license version and copyright date
o Added the xpp 3 license
---
LICENSE | 6 ++--
distribution/src/main/release/LICENSE | 52 +++++++++++++++++++++++++++++++++++
distribution/src/main/release/NOTICE | 4 +--
3 files changed, 56 insertions(+), 6 deletions(-)
diff --git a/LICENSE b/LICENSE
index 71b7015..ace2575 100644
--- a/LICENSE
+++ b/LICENSE
@@ -202,9 +202,9 @@
limitations under the License.
==================================================================================================
-slf4j 1.7.10 license:
+slf4j 1.7.25 license:
--------------------------------------------------------------------------------------------------
-Copyright (c) 2004-2013 QOS.ch
+Copyright (c) 2004-2017 QOS.ch
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining
@@ -246,4 +246,4 @@ jBCrypt is subject to the following license:
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
+ */
diff --git a/distribution/src/main/release/LICENSE b/distribution/src/main/release/LICENSE
index 6b0b127..4410743 100644
--- a/distribution/src/main/release/LICENSE
+++ b/distribution/src/main/release/LICENSE
@@ -201,3 +201,55 @@
See the License for the specific language governing permissions and
limitations under the License.
+==================================================================================================
+
+--------------------------------------------------------------------------------------------------
+
+
+# Indiana University Extreme! Lab Software License
+#
+# Version 1.1.1
+#
+# Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the distribution.
+#
+# 3. The end-user documentation included with the redistribution, if any,
+# must include the following acknowledgment:
+#
+# "This product includes software developed by the Indiana University
+# Extreme! Lab (http://www.extreme.indiana.edu/)."
+#
+# Alternately, this acknowledgment may appear in the software itself,
+# if and wherever such third-party acknowledgments normally appear.
+#
+# 4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab"
+# must not be used to endorse or promote products derived from this
+# software without prior written permission. For written permission,
+# please contact http://www.extreme.indiana.edu/.
+#
+# 5. Products derived from this software may not use "Indiana Univeristy"
+# name nor may "Indiana Univeristy" appear in their name, without prior
+# written permission of the Indiana University.
+#
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHORS, COPYRIGHT HOLDERS OR ITS CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
diff --git a/distribution/src/main/release/NOTICE b/distribution/src/main/release/NOTICE
index bcd297b..59fb927 100644
--- a/distribution/src/main/release/NOTICE
+++ b/distribution/src/main/release/NOTICE
@@ -1,5 +1,5 @@
Apache Directory LDAP API Distribution
-Copyright 2003-2014 The Apache Software Foundation
+Copyright 2003-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -7,8 +7,6 @@ The Apache Software Foundation (http://www.apache.org/).
Additional copyright notices and license terms applicable are
present in the 'licenses' directory.
-This product uses Apache Ant (http://ant.apache.org/).
-
This product includes/uses Apache Commons (http://commons.apache.org/).
This product includes/uses Apache Logging Services (http://logging.apache.org/).