You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/03/25 16:33:19 UTC
[1/2] git commit: reduced NOTICE files to the required minimum
Updated Branches:
refs/heads/master 6d04f325c -> 15a1cad97
reduced NOTICE files to the required minimum
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/1d7ca5db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/1d7ca5db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/1d7ca5db
Branch: refs/heads/master
Commit: 1d7ca5db38af8a42cb05e56fb07184abbe17fb16
Parents: d7f1a76
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Mar 25 16:33:00 2013 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Mar 25 16:33:00 2013 +0100
----------------------------------------------------------------------
NOTICE.txt | 37 +-----------
.../src/main/resources/installer/NOTICE.txt | 47 +--------------
.../src/main/webapp/META-INF/NOTICE | 45 +--------------
.../src/main/doc/NOTICE.txt | 13 ----
4 files changed, 4 insertions(+), 138 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1d7ca5db/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index c685135..dae3502 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -6,39 +6,4 @@ Portions of this software were originally based on the following:
Copyright 2008-2012 Salzburg Research Forschungsgesellschaft mbH
-These have been licensed to the Apache Software Foundation under a software grant.
-
-In addition, the source distribution of this product contains:
-
- - software based on IzPack licensed under Apache License 2.0
-
- - software based on D3.js licensed under New BSD License
-
- - software based on Dracula Graph Library licensed under MIT License
-
- - software based on strftime licensed under New BSD License
-
- - software based on JQuery licensed under MIT License
-
- - software based on CodeMirror licensed under Apache License 2.0
-
- - software based on D2R Snorql licensed under Apache License 2.0
-
- - software based on script.aculo.us licensed under Apache License 2.0
-
- - software based on Prototype licensed under Apache License 2.0
-
- - software based on SPARQL Flint Editor licensed under Apache License 2.0
-
- - software based on Sgvizler license under a MIT license
-
- - software based on MigLayout licensed under New BSD License
-
- - software based on SwingBits licensed under New BSD License
-
- - software based on rometools licensed under the Apache License 2.0
-
- - software based on jsonld-java licensed under the New BSD License
-
- - data based on JSON-LD Test Suite licensed under CC0 License
-
+These have been licensed to the Apache Software Foundation under a software grant.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1d7ca5db/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt b/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
index b5a309c..3672da9 100644
--- a/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
+++ b/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
@@ -6,57 +6,14 @@ The Apache Software Foundation (http://www.apache.org/).
Additionally, it includes the following 3rd party modules:
- Backport of JSR 166 under Public Domain
- CDI APIs and javax.inject under Apache License, Version 2.0
- CodeMirror licensed under Apache License 2.0
- Compiler assisted localization library (CAL10N) - API under MIT License
- D2R Snorql licensed under Apache License 2.0
- D3.js licensed under New BSD License
- Dracula Graph Library licensed under MIT License
- Ehcache Core under The Apache Software License, Version 2.0
- Expression Language API (2.1 Maintenance Release) under Apache License, Version 2.0
- FreeMarker under BSD-style license
- Guava: Google Core Libraries for Java under The Apache Software License, Version 2.0
+The following 3rd party modules included in this binary distribution require notice:
+
H2 Database Engine under The H2 License, Version 1.0
- iCal4j under iCal4j - License
- iCal4j VCard under iCal4j - License
- IzPack licensed under Apache License 2.0
- Jackson (Core and Data Mapper) under The Apache Software License, Version 2.0
- Janino under New BSD License
JavaBeans Activation Framework (JAF) under Common Development and Distribution License (CDDL) v1.0
- Javassist under Apache License 2.0
- JAX-RS Core API and JSON Provider under Apache License, Version 2.0
- Jaxen under Apache style license
- JBoss EJB 3.1 Common Interceptor Library API and Implementation under Apache License, Version 2.0
- JBoss Interceptors 1.1 API under Apache License, Version 2.0
- JDOM under Similar to Apache License but with the acknowledgment clause removed
- jOOQ under Apache License, Version 2.0
- jQuery under MIT License
JSON (JavaScript Object Notation) under provided without support or warranty
- jsonld-java licensed under the New BSD License
- jsoup under The MIT License
JSR-250 Common Annotations for the JavaTM Platform under COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
Logback Core and Classic Module under Eclipse Public License - v 1.0
- MigLayout licensed under New BSD License
- Mime Detection Utility under The Apache Software License, Version 2.0
- OpenCSV under Apache 2
- OpenRDF Sesame under Aduna BSD license
- PostgreSQL JDBC drivers under BSD License
- Prototype licensed under Apache License 2.0
- RESTEasy JAX-RS Implementation, CDI Integration and Jackson Provider under Apache License, Version 2.0
- rometools licensed under the Apache License 2.0
- Scannotation under Apache License, Version 2.0
- script.aculo.us licensed under Apache License 2.0
- Semargl: Core, RDF, RDFa and Sesame Integration under Apache Public License 2.0
Servlet API under Commons Development and Distribution License, Version 1.0
- Sgvizler license under a MIT-style license
- SLF4J API, Extension Module, and bridges for JUL, Log4j, JCL under MIT License
- SPARQL Flint Editor licensed under Apache License 2.0
- strftime licensed under New BSD License
- SwingBits licensed under New BSD License
- Weld APIs, SPIs, Implementation, SE and Servlet Core under Apache License, Version 2.0
- XML Commons External Components XML APIs under Apache Software License, Version 2.0
-
This project also contains annotations derived from JCIP-ANNOTATIONS
Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1d7ca5db/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE b/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
index 2f20b8b..c2e3705 100644
--- a/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
+++ b/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
@@ -4,57 +4,14 @@ Copyright 2012-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-Additionally, it includes the following 3rd party modules:
+The following 3rd party modules included in this binary distribution require notice:
- Backport of JSR 166 under Public Domain
- CDI APIs and javax.inject under Apache License, Version 2.0
- CodeMirror licensed under Apache License 2.0
- Compiler assisted localization library (CAL10N) - API under MIT License
- D2R Snorql licensed under Apache License 2.0
- D3.js licensed under New BSD License
- Dracula Graph Library licensed under MIT License
- Ehcache Core under The Apache Software License, Version 2.0
- Expression Language API (2.1 Maintenance Release) under Apache License, Version 2.0
- FreeMarker under BSD-style license
- Guava: Google Core Libraries for Java under The Apache Software License, Version 2.0
H2 Database Engine under The H2 License, Version 1.0
- iCal4j under iCal4j - License
- iCal4j VCard under iCal4j - License
- Jackson (Core and Data Mapper) under The Apache Software License, Version 2.0
- Janino under New BSD License
JavaBeans Activation Framework (JAF) under Common Development and Distribution License (CDDL) v1.0
- Javassist under Apache License 2.0
- JAX-RS Core API and JSON Provider under Apache License, Version 2.0
- Jaxen under Apache style license
- JBoss EJB 3.1 Common Interceptor Library API and Implementation under Apache License, Version 2.0
- JBoss Interceptors 1.1 API under Apache License, Version 2.0
- JDOM under Similar to Apache License but with the acknowledgment clause removed
- jOOQ under Apache License, Version 2.0
- jQuery under MIT License
JSON (JavaScript Object Notation) under provided without support or warranty
- jsonld-java licensed under the New BSD License
- jsoup under The MIT License
JSR-250 Common Annotations for the JavaTM Platform under COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
Logback Core and Classic Module under Eclipse Public License - v 1.0
- Mime Detection Utility under The Apache Software License, Version 2.0
- OpenCSV under Apache 2
- OpenRDF Sesame under Aduna BSD license
- PostgreSQL JDBC drivers under BSD License
- Prototype licensed under Apache License 2.0
- RESTEasy JAX-RS Implementation, CDI Integration and Jackson Provider under Apache License, Version 2.0
- rometools licensed under the Apache License 2.0
- Scannotation under Apache License, Version 2.0
- script.aculo.us licensed under Apache License 2.0
- Semargl: Core, RDF, RDFa and Sesame Integration under Apache Public License 2.0
Servlet API under Commons Development and Distribution License, Version 1.0
- Sgvizler license under a MIT-style license
- SLF4J API, Extension Module, and bridges for JUL, Log4j, JCL under MIT License
- SPARQL Flint Editor licensed under Apache License 2.0
- strftime licensed under New BSD License
- Weld APIs, SPIs, Implementation, SE and Servlet Core under Apache License, Version 2.0
- XML Commons External Components XML APIs under Apache Software License, Version 2.0
-
-
This project also contains annotations derived from JCIP-ANNOTATIONS
Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1d7ca5db/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/NOTICE.txt
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/NOTICE.txt b/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/NOTICE.txt
index 7bdb5e3..f92ef64 100644
--- a/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/NOTICE.txt
+++ b/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/NOTICE.txt
@@ -6,20 +6,7 @@ The Apache Software Foundation (http://www.apache.org/).
Additionally, it includes the following 3rd party modules:
- Compiler assisted localization library (CAL10N) - API under MIT License
- Guava: Google Core Libraries for Java under The Apache Software License, Version 2.0
- Jackson (Core and Data Mapper) under The Apache Software License, Version 2.0
- Jaxen under Apache style license
- JDOM under Similar to Apache License but with the acknowledgment clause removed
- jsonld-java licensed under the New BSD License
- jsoup under The MIT License
Logback Core and Classic Module under Eclipse Public License - v 1.0
- OpenRDF Sesame under Aduna BSD license
- rometools licensed under the Apache License 2.0
- Semargl: Core, RDF, RDFa and Sesame Integration under Apache Public License 2.0
- SLF4J API, Extension Module, and bridges for JUL, Log4j, JCL under MIT License
- OneJar under New BSD License
-
This project also contains annotations derived from JCIP-ANNOTATIONS
Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
\ No newline at end of file
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-marmotta
Posted by ss...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/15a1cad9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/15a1cad9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/15a1cad9
Branch: refs/heads/master
Commit: 15a1cad97ea42bdb86c5dba91c7329b9852fda24
Parents: 1d7ca5d 6d04f32
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Mar 25 16:33:07 2013 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Mar 25 16:33:07 2013 +0100
----------------------------------------------------------------------
.../resources/security-profile.simple.properties | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------