sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mattm...@apache.org
Subject svn commit: r1033442 - in /incubator/sis/trunk: NOTICE.txt sis-parent/pom.xml
Date Wed, 10 Nov 2010 12:54:22 GMT
Author: mattmann
Date: Wed Nov 10 12:54:22 2010
New Revision: 1033442

URL: http://svn.apache.org/viewvc?rev=1033442&view=rev
Log:
- add JDOM license to NOTICE.txt and upgrade to apache parent 7 per comments from Mark Struberg.

Modified:
    incubator/sis/trunk/NOTICE.txt
    incubator/sis/trunk/sis-parent/pom.xml

Modified: incubator/sis/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/sis/trunk/NOTICE.txt?rev=1033442&r1=1033441&r2=1033442&view=diff
==============================================================================
--- incubator/sis/trunk/NOTICE.txt (original)
+++ incubator/sis/trunk/NOTICE.txt Wed Nov 10 12:54:22 2010
@@ -3,3 +3,58 @@ Copyright 2010 The Apache Software Found
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
+
+This product includes JDOM 1.0 as a transitive dependency 
+of the ROME and Georss-ROME libraries:
+
+ Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
+ 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 disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS 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.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>. 
+
+

Modified: incubator/sis/trunk/sis-parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sis/trunk/sis-parent/pom.xml?rev=1033442&r1=1033441&r2=1033442&view=diff
==============================================================================
--- incubator/sis/trunk/sis-parent/pom.xml (original)
+++ incubator/sis/trunk/sis-parent/pom.xml Wed Nov 10 12:54:22 2010
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>6</version>
+    <version>7</version>
   </parent>
  
   <groupId>org.apache.sis</groupId>



Mime
View raw message