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 17:14:09 UTC

git commit: towards fixing licenses and dependencies

Updated Branches:
  refs/heads/master 3592909c7 -> be79e0fd7


towards fixing licenses and dependencies


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

Branch: refs/heads/master
Commit: be79e0fd785cefa15999088a51a090c34c8868f0
Parents: 3592909
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Mar 25 17:14:02 2013 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Mar 25 17:14:02 2013 +0100

----------------------------------------------------------------------
 .../src/main/webapp/META-INF/NOTICE                |   16 ++++++++++----
 platform/marmotta-core/pom.xml                     |    4 ---
 2 files changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/be79e0fd/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 c2e3705..37c388f 100644
--- a/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
+++ b/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
@@ -6,12 +6,18 @@ The Apache Software Foundation (http://www.apache.org/).
 
 The following 3rd party modules included in this binary distribution require notice:
 
-  H2 Database Engine under The H2 License, Version 1.0
+- H2 Database Engine under The Eclipse Public License, Version 1.0; the source
+  code for this library is available at http://h2database.com/
+
   JavaBeans Activation Framework (JAF) under Common Development and Distribution License (CDDL) v1.0
-  JSON (JavaScript Object Notation) under provided without support or warranty
-  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
-  Servlet API under Commons Development and Distribution License, Version 1.0
+- JSON (JavaScript Object Notation) under provided without support or
+  warranty; the source code for this library is available at
+  https://github.com/douglascrockford/JSON-java
+- JSR-250 Common Annotations for the JavaTM Platform under COMMON DEVELOPMENT
+  AND DISTRIBUTION LICENSE (CDDL) Version 1.0; source code for this library
+  is available at http://glassfish.java.net/
+- Logback Core and Classic Module under Eclipse Public License, Version 1.0; the
+  source code for this library is available at http://logback.qos.ch/
 
 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/be79e0fd/platform/marmotta-core/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/pom.xml b/platform/marmotta-core/pom.xml
index 1dcd4e3..5b3c3de 100644
--- a/platform/marmotta-core/pom.xml
+++ b/platform/marmotta-core/pom.xml
@@ -275,10 +275,6 @@
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-xc</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-        </dependency>
 
         <!-- Front-end -->
         <dependency>