You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by rv...@apache.org on 2014/05/15 12:26:10 UTC
svn commit: r1594851 - in /jena/Experimental/hadoop-rdf: LICENSE
hadoop-rdf-mapreduce/pom.xml
Author: rvesse
Date: Thu May 15 10:26:10 2014
New Revision: 1594851
URL: http://svn.apache.org/r1594851
Log:
Minor corrections to LICENSE and add missing license to POM per comments from Andy (JENA-666)
Modified:
jena/Experimental/hadoop-rdf/LICENSE
jena/Experimental/hadoop-rdf/hadoop-rdf-mapreduce/pom.xml
Modified: jena/Experimental/hadoop-rdf/LICENSE
URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/LICENSE?rev=1594851&r1=1594850&r2=1594851&view=diff
==============================================================================
--- jena/Experimental/hadoop-rdf/LICENSE (original)
+++ jena/Experimental/hadoop-rdf/LICENSE Thu May 15 10:26:10 2014
@@ -174,49 +174,3 @@
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
-----------------------------------------------------------------------------------
-The following files contain code contributed by Plugged In Software:
-
-src/main/java/com/hp/hpl/jena/rdf/arp/ExtendedHandler.java
-src/main/java/com/hp/hpl/jena/rdf/arp/impl/XMLHandler.java
-src/main/java/com/hp/hpl/jena/rdf/arp/ARP.java
-
- (c) Copyright 2003, Plugged In Software
-
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-----------------------------------------------------------------------------------
-
-- - - - - - - - - - - - - - - - - - - - - - -
-
- Copyright (c) 2004-2009 Mort Bay Consulting Pty. Ltd.
-
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-and Apache License v2.0 which accompanies this distribution.
-
-The Eclipse Public License is available at
- http://www.eclipse.org/legal/epl-v10.html
-The Apache License v2.0 is available at
- http://www.opensource.org/licenses/apache2.0.php
Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-mapreduce/pom.xml
URL: http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-mapreduce/pom.xml?rev=1594851&r1=1594850&r2=1594851&view=diff
==============================================================================
--- jena/Experimental/hadoop-rdf/hadoop-rdf-mapreduce/pom.xml (original)
+++ jena/Experimental/hadoop-rdf/hadoop-rdf-mapreduce/pom.xml Thu May 15 10:26:10 2014
@@ -1,3 +1,19 @@
+<!--
+ 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.
+ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>