geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [02/50] [abbrv] incubator-geode git commit: GEODE-1267: Update NOTICE references to Spring dependencies
Date Thu, 28 Apr 2016 23:09:41 GMT
GEODE-1267: Update NOTICE references to Spring dependencies

Improved NOTICE text referencing Spring libraries for LDAP, Shell,
and HATEOS.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/90234293
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/90234293
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/90234293

Branch: refs/heads/feature/GEODE-1255
Commit: 9023429386d690f315a28c5e6df12f18a50b0787
Parents: 7e1656b
Author: Anthony Baker <abaker@apache.org>
Authored: Wed Apr 20 15:00:25 2016 -0700
Committer: Anthony Baker <abaker@apache.org>
Committed: Thu Apr 21 11:52:23 2016 -0700

----------------------------------------------------------------------
 geode-assembly/src/main/dist/NOTICE           | 36 +++-------------------
 geode-pulse/src/main/webapp/META-INF/NOTICE   | 18 ++---------
 geode-web-api/src/main/webapp/META-INF/NOTICE | 12 +-------
 3 files changed, 7 insertions(+), 59 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/90234293/geode-assembly/src/main/dist/NOTICE
----------------------------------------------------------------------
diff --git a/geode-assembly/src/main/dist/NOTICE b/geode-assembly/src/main/dist/NOTICE
index f054cf5..4556826 100644
--- a/geode-assembly/src/main/dist/NOTICE
+++ b/geode-assembly/src/main/dist/NOTICE
@@ -302,41 +302,13 @@ Copyright (c) [2012-2014] Pivotal Software, Inc.
 
 Spring LDAP Core 1.3.2
 
-   ======================================================================
-   == NOTICE file corresponding to section 4 d of the Apache License,  ==
-   == Version 2.0, for the Spring LDAP distribution.                   ==
-   ======================================================================
-
-   This product includes software developed by
-   the Apache Software Foundation (http://www.apache.org).
-
-   The end-user documentation included with a redistribution, if any,
-   must include the following acknowledgement:
-
-     "This product includes software developed by the Spring LDAP
-      Project (http://www.springframework.org/ldap)."
-
-   Alternately, this acknowledgement may appear in the software itself,
-   if and wherever such third-party acknowledgements normally appear.
+   This product includes software developed by the Spring LDAP
+   Project (http://www.springframework.org/ldap).
 
 Spring Shell 1.1.0
 
-   ======================================================================
-   == NOTICE file corresponding to section 4 d of the Apache License,  ==
-   == Version 2.0, for the Spring Framework distribution.              ==
-   ======================================================================
-
-   This product includes software developed by
-   the Apache Software Foundation (http://www.apache.org).
-
-   The end-user documentation included with a redistribution, if any,
-   must include the following acknowledgement:
-
-     "This product includes software developed by the Spring Framework
-      Project (http://www.springframework.org)."
-
-   Alternately, this acknowledgement may appear in the software itself,
-   if and wherever such third-party acknowledgements normally appear.
+   This product includes software developed by the Spring Framework
+   Project (http://www.springframework.org).
 
    The names "Spring", "Spring Framework", and "Spring Shell" must
    not be used to endorse or promote products derived from this

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/90234293/geode-pulse/src/main/webapp/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/META-INF/NOTICE b/geode-pulse/src/main/webapp/META-INF/NOTICE
index 25a229d..763788e 100644
--- a/geode-pulse/src/main/webapp/META-INF/NOTICE
+++ b/geode-pulse/src/main/webapp/META-INF/NOTICE
@@ -72,19 +72,5 @@ Copyright (c) 2002-2015 Pivotal, Inc.
 
 Spring LDAP Core 1.3.2.RELEASE
 
-   ======================================================================
-   == NOTICE file corresponding to section 4 d of the Apache License,  ==
-   == Version 2.0, for the Spring LDAP distribution.                   ==
-   ======================================================================
-
-   This product includes software developed by
-   the Apache Software Foundation (http://www.apache.org).
-
-   The end-user documentation included with a redistribution, if any,
-   must include the following acknowledgement:
-
-     "This product includes software developed by the Spring LDAP
-      Project (http://www.springframework.org/ldap)."
-
-   Alternately, this acknowledgement may appear in the software itself,
-   if and wherever such third-party acknowledgements normally appear.
+   This product includes software developed by the Spring LDAP
+   Project (http://www.springframework.org/ldap).

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/90234293/geode-web-api/src/main/webapp/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/META-INF/NOTICE b/geode-web-api/src/main/webapp/META-INF/NOTICE
index b62c5dc..7cd12aa 100644
--- a/geode-web-api/src/main/webapp/META-INF/NOTICE
+++ b/geode-web-api/src/main/webapp/META-INF/NOTICE
@@ -76,14 +76,4 @@ Copyright (c) [2012-2014] Pivotal Software, Inc.
   This product may include a number of subcomponents with
   separate copyright notices and license terms. Your use of the source
   code for the these subcomponents is subject to the terms and
-  conditions of the subcomponent's license, as noted in the LICENSE file.Spring Framework
4.2.4.RELEASE
-  Copyright (c) 2002-2015 Pivotal, Inc.
-  
-  This product is licensed to you under the Apache License, Version 2.0
-  (the "License"). You may not use this product except in compliance with
-  the License.
-  
-  This product may include a number of subcomponents with separate
-  copyright notices and license terms. Your use of the source code for
-  these subcomponents is subject to the terms and conditions of the
-  subcomponent's license, as noted in the license.txt file.
+  conditions of the subcomponent's license, as noted in the LICENSE file.


Mime
View raw message