syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [1/2] syncope git commit: Reviewing LICENSE / NOTICE after last additions
Date Tue, 26 Apr 2016 07:35:24 GMT
Repository: syncope
Updated Branches:
  refs/heads/master daecdbbc0 -> f14320e05


Reviewing LICENSE / NOTICE after last additions


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

Branch: refs/heads/master
Commit: d2404b9073b0e54f1efc9554d4d54b7fc44408a1
Parents: daecdbb
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Fri Apr 22 10:39:59 2016 +0200
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Fri Apr 22 11:22:10 2016 +0200

----------------------------------------------------------------------
 deb/console/LICENSE |  5 ++++
 deb/console/NOTICE  |  5 ++++
 deb/core/LICENSE    |  5 ++++
 deb/core/NOTICE     |  4 +++
 installer/LICENSE   | 65 +++++++++++++-----------------------------------
 installer/NOTICE    | 11 +++-----
 pom.xml             | 10 ++++++++
 standalone/LICENSE  | 10 ++++++++
 standalone/NOTICE   | 10 +++++++-
 9 files changed, 68 insertions(+), 57 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/d2404b90/deb/console/LICENSE
----------------------------------------------------------------------
diff --git a/deb/console/LICENSE b/deb/console/LICENSE
index 2118cbd..1d53870 100644
--- a/deb/console/LICENSE
+++ b/deb/console/LICENSE
@@ -668,6 +668,11 @@ This is licensed under the MIT license, see above.
 
 ==
 
+For slimScroll (http://rocha.la/jQuery-slimScroll):
+This is licensed under the MIT license, see above.
+
+==
+
 For javax.annotation-api (https://jcp.org/en/jsr/detail?id=250):
 This is licensed under the CDDL 1.0, see above.
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/d2404b90/deb/console/NOTICE
----------------------------------------------------------------------
diff --git a/deb/console/NOTICE b/deb/console/NOTICE
index e3791b1..0fda330 100644
--- a/deb/console/NOTICE
+++ b/deb/console/NOTICE
@@ -57,6 +57,11 @@ Copyright (c) 2016 Drifty (http://drifty.com/)
 
 ==
 
+This product includes software developed by the slimScroll project.
+Copyright (c) 2011 Piotr Rochala (http://rocha.la)
+
+==
+
 This product includs software developed by Oracle.
 Copyright (c) 2012-2013 Oracle and/or its affiliates. All rights reserved.
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/d2404b90/deb/core/LICENSE
----------------------------------------------------------------------
diff --git a/deb/core/LICENSE b/deb/core/LICENSE
index 2c0ac26..6ce8c66 100644
--- a/deb/core/LICENSE
+++ b/deb/core/LICENSE
@@ -213,6 +213,11 @@ This is licensed under the AL 2.0, see above.
 
 ==
 
+For Java Uuid Generator (JUG) (http://wiki.fasterxml.com/JugHome):
+This is licensed under the AL 2.0, see above.
+
+==
+
 For Guava (https://github.com/google/guava):
 This is licensed under the AL 2.0, see above.
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/d2404b90/deb/core/NOTICE
----------------------------------------------------------------------
diff --git a/deb/core/NOTICE b/deb/core/NOTICE
index 853b27b..138ea15 100644
--- a/deb/core/NOTICE
+++ b/deb/core/NOTICE
@@ -17,6 +17,10 @@ This product includes software developed by the Jackson project.
 
 ==
 
+This product includes software developed by the Java Uuid Generator (JUG) project.
+
+==
+
 This product includes software developed by the Google Guava project.
 Copyright (c) 2016 The Guava Authors.
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/d2404b90/installer/LICENSE
----------------------------------------------------------------------
diff --git a/installer/LICENSE b/installer/LICENSE
index 13d76cc..2468d8b 100644
--- a/installer/LICENSE
+++ b/installer/LICENSE
@@ -203,7 +203,17 @@
 
 ==
 
-For ASM (http://asm.ow2.org/):
+For Plexus Classworlds (https://codehaus-plexus.github.io/plexus-classworlds/):
+This is licensed under the AL 2.0, see above.
+
+==
+
+For Jackson (http://wiki.fasterxml.com/JacksonHome):
+This is licensed under the AL 2.0, see above.
+
+==
+
+For Laf-plugin (https://java.net/projects/laf-plugin):
 This is licensed under the BSD license:
 
 Redistribution and use in source and binary forms, with or without 
@@ -233,53 +243,27 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ==
 
-For NanoXML lite (http://nanoxml.sourceforge.net/orig/):
-This is licensed under the zlib/libpng license:
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgement in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-
-==
-
-For Plexus Classworlds (https://codehaus-plexus.github.io/plexus-classworlds/):
-This is licensed under the AL 2.0, see above.
-
-==
-
-For Jackson (http://wiki.fasterxml.com/JacksonHome):
-This is licensed under the AL 2.0, see above.
+For Laf-widget (https://java.net/projects/laf-widget):
+This is licensed under the BSD license, see above.
 
 ==
 
-For JGoodies Looks (https://java.net/projects/looks):
+For Substance (https://java.net/projects/substance):
 This is licensed under the BSD license, see above.
 
 ==
 
-For Jline v2 (http://jline.github.io/jline2/):
+For Trident (https://kenai.com/projects/trident/):
 This is licensed under the BSD license, see above.
 
 ==
 
-For Laf-plugin (https://java.net/projects/laf-plugin):
+For JGoodies Looks (https://java.net/projects/looks):
 This is licensed under the BSD license, see above.
 
 ==
 
-For Laf-widget (https://java.net/projects/laf-widget):
+For Jline v2 (http://jline.github.io/jline2/):
 This is licensed under the BSD license, see above.
 
 ==
@@ -294,21 +278,11 @@ This is licensed under the AL 2.0, see above.
 
 ==
 
-For Eclipse SWT (https://www.eclipse.org/swt/):
-This is licensed under the AL 2.0, see above.
-
-==
-
 For Hamcrest (http://hamcrest.org/):
 This is licensed under the BSD license, see above.
 
 ==
 
-For Substance (https://java.net/projects/substance):
-This is licensed under the BSD license, see above.
-
-==
-
 For JDOM (http://www.jdom.org/):
 This is licensed under the BSD license, see above.
 
@@ -319,11 +293,6 @@ This is licensed under the BSD license, see above.
 
 ==
 
-For Trident (https://kenai.com/projects/trident/):
-This is licensed under the BSD license, see above.
-
-==
-
 For MXP1: Xml Pull Parser 3rd Edition (http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/):
 This is licensed under the Indiana University Extreme! Lab Software License, version 1.1.1:
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/d2404b90/installer/NOTICE
----------------------------------------------------------------------
diff --git a/installer/NOTICE b/installer/NOTICE
index cb2c606..61d5145 100644
--- a/installer/NOTICE
+++ b/installer/NOTICE
@@ -9,12 +9,12 @@ with which this file is now or was at one time distributed.
 
 ==
 
-This product includes software developed by the NanoXML project.
-Copyright (c) 2000-2002 Marc De Scheemaecker, All Rights Reserved.
+This product includes software developed by the Jackson project.
 
 ==
 
-This product includes software developed by the Jackson project.
+This product includes software developed by the Trident project.
+ Copyright (c) 2005-2010 Trident Kirill Grouchnikov. All Rights Reserved.
 
 ==
 
@@ -38,8 +38,3 @@ This product includes software developed by the JDOM project.
 
 This product includes software developed by the PicoContainer project.
  Copyright (C) 2003-2011 PicoContainer Committers. All rights reserved.
-
-==
-
-This product includes software developed by the Trident project.
- Copyright (c) 2005-2010 Trident Kirill Grouchnikov. All Rights Reserved.

http://git-wip-us.apache.org/repos/asf/syncope/blob/d2404b90/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3598102..ff39755 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1243,6 +1243,16 @@ under the License.
         <groupId>org.codehaus.izpack</groupId>
         <artifactId>izpack-panel</artifactId>
         <version>${izpack.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.icepdf.os</groupId>
+            <artifactId>icepdf-core</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.icepdf.os</groupId>
+            <artifactId>icepdf-viewer</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       
       <dependency>

http://git-wip-us.apache.org/repos/asf/syncope/blob/d2404b90/standalone/LICENSE
----------------------------------------------------------------------
diff --git a/standalone/LICENSE b/standalone/LICENSE
index f204452..a143104 100644
--- a/standalone/LICENSE
+++ b/standalone/LICENSE
@@ -272,6 +272,11 @@ This is licensed under the AL 2.0, see above.
 
 ==
 
+For Java Uuid Generator (JUG) (http://wiki.fasterxml.com/JugHome):
+This is licensed under the AL 2.0, see above.
+
+==
+
 For Guava (https://github.com/google/guava):
 This is licensed under the AL 2.0, see above.
 
@@ -937,6 +942,11 @@ This is licensed under the MIT license, see above.
 
 ==
 
+For slimScroll (http://rocha.la/jQuery-slimScroll):
+This is licensed under the MIT license, see above.
+
+==
+
 For javax.annotation-api (https://jcp.org/en/jsr/detail?id=250):
 This is licensed under the CDDL 1.0, see above.
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/d2404b90/standalone/NOTICE
----------------------------------------------------------------------
diff --git a/standalone/NOTICE b/standalone/NOTICE
index 68941b3..03762ef 100644
--- a/standalone/NOTICE
+++ b/standalone/NOTICE
@@ -57,6 +57,10 @@ This product includes software developed by the Jackson project.
 
 ==
 
+This product includes software developed by the Java Uuid Generator (JUG) project.
+
+==
+
 This product includes software developed by the Google Guava project.
 Copyright (c) 2016 The Guava Authors.
 
@@ -92,6 +96,11 @@ Copyright (c) 2016 Drifty (http://drifty.com/)
 
 ==
 
+This product includes software developed by the slimScroll project.
+Copyright (c) 2011 Piotr Rochala (http://rocha.la)
+
+==
+
 This product includs software developed by Oracle.
 Copyright (c) 2012-2013 Oracle and/or its affiliates. All rights reserved.
 
@@ -265,4 +274,3 @@ All Rights Reserved.
 
 This product includes software developed by the X-editable project.
 Copyright (c) 2012 Vitaliy Potapov
-


Mime
View raw message