http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/d5055d6b/launchers/marmotta-webapp/NOTICE.txt
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/NOTICE.txt 
b/launchers/marmotta-webapp/NOTICE.txt
index 2f20b8b..881a91a 100644
--- a/launchers/marmotta-webapp/NOTICE.txt
+++ b/launchers/marmotta-webapp/NOTICE.txt
@@ -1,62 +1,259 @@
-Apache Marmotta Web Application
-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:
-
-  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
+Apache Marmotta Webapp, Copyright 2012-2013 The Apache Software Foundation
 
+This product includes software developed at The Apache Software Foundation 
(http://www.apache.org).
+
+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.
+
+This product also includes the following third-party components:
+
+* H2, http://www.h2database.com
+
+  Copyright (c) 2013 H2 Group
+
+* Logback, http://logback.qos.ch
+
+  Copyright (C) 2012 QOS.ch
+
+* JDOM, http://www.jdom.org
+
+  Copyright (c) 2012 Jason Hunter & Brett McLaughlin
+
+* Freemarker, http://freemarker.org
+
+  Copyright (c) 2003 The Visigoth Software Society
+
+* CAL10N, http://cal10n.qos.ch
+
+  Copyright (c) 2009 QOS.ch
+
+* Guava, http://guava-libraries.googlecode.com
+
+  Copyright (c) 2013 Google Inc.
+
+* Jackson, http://jackson.codehaus.org
+
+  Copyright (c) 2010 FasterXML LLC.
+
+* MimeUtil, http://mime-util.sourceforge.net
+
+  Copyright (c) 2010 Medsea Business Solutions S.L.
+
+* OpenCSV, http://opencsv.sourceforge.net
+
+  Copyright (c) 2005 Bytecode Pty Ltd.
+
+* OpenRDF Sesame, http://www.openrdf.org
+
+  Copyright (c) 2013 Aduna
+
+  This software includes code developed by Aduna
+  (http://www.aduna-software.com/).
+
+  This software includes code developed by Ontotext AD
+  (http://www.ontotext.com/).
+
+  This software includes code developed by 3 Round Stones
+  (http://www.3roundstones.com/).
+
+  This software includes code developed by Fluid Operations
+  (http://www.fluidops.com/).
+
+  This software includes code developed by the Information Management Group at
+  Food & Biobased Research, Wageningen University (http://www.fbr.wur.nl/).
+
+  This software includes code developed by Clark & Parsia
+  (http://clarkparsia.com/).
+
+  This software includes code developed by the Institute for Defense Analyses
+  (IDA) (http://www.ida.org/).
+
+  This software includes code developed by Atos (http://www.atos.net/).
+
+  This software includes code developed by Peter Ansell.
+
+  The above parties have licensed their code contributions to Aduna under the
+  terms of a contributor license agreement (CLA).
+
+  This product includes software developed by the JUnit project
+  (http://www.junit.org). License: http://junit.sourceforge.net/cpl-v10.html
+
+  Parts of this product use software developed by JSON.org
+  (http://www.json.org). License: http://www.json.org/license.html
+
+  Parts of this product use software developed by the Mockito project
+  (http://mockito.googlecode.com). License: 
https://github.com/mockito/mockito/blob/master/LICENSE
+
+* PostgreSQL JDBC, http://jdbc.postgresql.org
+
+  Copyright (c) 2011 PostgreSQL Global Development Group
+
+* Scannotation, http://scannotation.sourceforge.net
+
+  Copyright (c) 2011 Bill Burke
+
+* SLF4J, http://www.slf4j.org
+
+  Copyright (c) 2013 QOS.ch
+
+* Semargl, http://semarglproject.org
+
+  Copyright (c) 2012 Lev Khomich
+
+  This product uses software developed by The Apache Software Foundation:
+  Clerezza, Jena, IO Commons (http://www.apache.org/).
+
+  This product includes/uses test suite developed by Hewlett-Packard
+  (http://hp.com/). Copyright (c) 2002, Hewlett-Packard Company.
+
+  This product includes/uses test suite developed by W3C Consortium.
+
+  This product includes/uses RDFa test harness developed by RDF Web 
Applications
+  Working Group (http://www.w3.org/2010/02/rdfa/).
+
+* Janino, http://janino.codehaus.org
+
+  Copyright (c) 2010 Arno Unkrig
+
+* Java Injection API, http://atinject.googlecode.com
+
+  Copyright (c) 2009 The JSR-330 Expert Group
+
+* Javassist, http://www.jboss.org/javassist
+
+  Copyright (c) 2013 Shigeru Chiba
+
+* Jaxen, http://jaxen.codehaus.org
+
+  Copyright (c) 2006 The Werken Company
+
+* JSoup, http://jsoup.org
+
+  Copyright (c) 2013 Jonathan Hedley
+
+* EHCache, http://ehcache.org
+
+  Copyright (c) 2010 Terracotta, Inc.
+
+* CDI, http://github.com/jboss/cdi
+
+  Copyright (c) 2012 Red Hat Middleware, LLC
+
+* Weld, http://github.com/weld
+
+  Copyright (c) 2012 Red Hat Middleware, LLC
+
+* Bean Validation, http://github.com/hibernate/hibernate-validator
+
+  Copyright (c) 2012 Red Hat Middleware, LLC
+
+* JBoss EJB Common Interceptor, 
http://github.com/jbossinterceptors/jbossinterceptors
+
+  Copyright (c) 2012 Red Hat Middleware, LLC
+
+* RESTEasy, http://www.jboss.org/resteasy
+
+  Copyright (c) 2012 Red Hat Middleware, LLC
+
+* Java Activation, http://www.oracle.com
+
+  Copyright (c) 2012 Oracle Corporation
+
+* Java Servlet API, http://www.oracle.com
+
+  Copyright (c) 2012 Oracle Corporation
+
+* Common Annotations (JSR-250), http://www.oracle.com
+
+  Copyright (c) 2012 Oracle Corporation
+
+* Expression Language, http://www.oracle.com
+
+  Copyright (c) 2012 Oracle Corporation
+
+* Apache Xerces, http://xerces.apache.org
+
+  Copyright (c) 2013 The Apache Software Foundation
+
+  Portions of this software were originally based on the following:
+   - software copyright (c) 1999, IBM Corporation, http://www.ibm.com.
+   - software copyright (c) 1999, Sun Microsystems, http://www.sun.com.
+   - voluntary contributions made by Paul Eng on behalf of the
+     Apache Software Foundation that were originally developed at
+     iClick, Inc., software copyright (c) 1999.
+
+* "Java Concurrency in Practice" book annotations component, http://jcip.net
+
+  Copyright (c) 2005 Brian Goetz and Tim Peierls
+
+* Hamcrest, http://www.hamcrest.org
+
+  Copyright (c) 2000-2006 Joe Walnes, Nat Pryce, Steve Freeman
+
+* D3.js, http://d3js.org
+
+  Copyright (c) 2013 Michael Bostock
+
+* Dracula Graph Library, http://www.graphdracula.net
+
+  Copyright (c) 2013 Johann Philipp Strathausen
+
+* strftime, http://hacks.bluesmoon.info/strftime
+
+  Copyright (c) 2008 Philip S Tellis
+
+* jQuery, http://jquery.com
+
+  Copyright (c) 2013 jQuery Foundation
+
+* CodeMirror, http://codemirror.net
+
+  Copyright (c) 2013 Marijn Haverbeke
+
+* D2R Snorql, http://www4.wiwiss.fu-berlin.de/bizer/d2r-server/,
+
+  Copyright (c) 2007 Richard Cyganiak
+
+* script.aculo.us, http://script.aculo.us
+
+  Copyright (c) 2010 Thomas Fuchs
+
+* Prototype, http://prototypejs.org
+
+  Copyright (c) 2010 Sam Stephenson
+
+* SPARQL Flint Editor, http://github.com/TSO-Openup/FlintSparqlEditor
+
+  Copyright (c) 2011 TSO Ltd
+
+* Sgvizler, http://sgvizler.googlecode.com
+
+  Copyright (c) 2011 Martin G. Skjæveland
+
+* MigLayout, http://www.migcalendar.com/miglayout
+
+  Copyright (c) 2004 MiG InfoCom AB
+
+* SwingBits, http://swingbits.sourceforge.net
+
+  Copyright (c) 2006 EzWare
+
+* ROME, http://rometools.jira.com
+
+  Copyright (c) 2004 Sun Microsystems
+
+* JSONLD-Java, http://github.com/tristan/jsonld-java
+
+  Copyright (c) 2012, Deutsches Forschungszentrum für Künstliche Intelligenz 
GmbH
+
+* JSON-LD Test Suite, http://json-ld.org/test-suite
+
+  Public Domain (Creative Commons Zero license) without copyright
+
+* ical4j test suite, http://ical4j.googlecode.com
+
+  Copyright (c) 2011 Ben Fortuna
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/d5055d6b/license-mappings.xml
----------------------------------------------------------------------
diff --git a/license-mappings.xml b/license-mappings.xml
index dd4d204..6b1e541 100644
--- a/license-mappings.xml
+++ b/license-mappings.xml
@@ -1,23 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ -->
+
+<license-lookup 
xmlns="https://source.jasig.org/schemas/maven-notice-plugin/license-lookup"; 
+                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
+                
xsi:schemaLocation="https://source.jasig.org/schemas/maven-notice-plugin/license-lookup
 
https://source.jasig.org/schemas/maven-notice-plugin/license-lookup/license-lookup-v1.0.xsd";>
+
+    <!-- see also http://source.jasig.org/licenses/license-mappings.xml -->
 
-<license-lookup 
xmlns="https://source.jasig.org/schemas/maven-notice-plugin/license-lookup"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="https://source.jasig.org/schemas/maven-notice-plugin/license-lookup
 
https://source.jasig.org/schemas/maven-notice-plugin/license-lookup/license-lookup-v1.0.xsd";>
-    <!-- see also https://source.jasig.org/licenses/license-mappings.xml -->
     <artifact>
         <groupId>javax.el</groupId>
         <artifactId>el-api</artifactId>
@@ -26,9 +30,7 @@
     <artifact>
         <groupId>javax.servlet</groupId>
         <artifactId>servlet-api</artifactId>
-        <license>
-            Commons Development and Distribution License, Version 1.0
-        </license>
+        <license>Commons Development and Distribution License, Version 
1.0</license>
     </artifact>
     <artifact>
         <groupId>jaxen</groupId>
@@ -50,4 +52,5 @@
         <artifactId>scannotation</artifactId>
         <license>Apache License, Version 2.0</license>
     </artifact>
+
 </license-lookup>

Reply via email to