Author: mfranklin
Date: Mon Apr 1 20:41:08 2013
New Revision: 1463295
URL: http://svn.apache.org/r1463295
Log:
Updated LICENSE with BSD inclusion for STAX
Modified:
rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICENSE
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-dependencies/pom.xml
Modified: rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICENSE
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICENSE?rev=1463295&r1=1463294&r2=1463295&view=diff
==============================================================================
--- rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICENSE
(original)
+++ rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICENSE Mon Apr
1 20:41:08 2013
@@ -913,6 +913,36 @@ Except as contained in this notice, the
promote the sale, use or other dealings in this Software without prior written
authorization of the copyright holder.
======================================================================================================================
+For STAX API:
+
+Copyright (c) 2004-2010, Woodstox Project (http://woodstox.codehaus.org/)
+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. Neither the name of the Woodstox XML Processor nor the names
+ of its contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR 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.
+
+======================================================================================================================
For SLF4J:
Modified:
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-dependencies/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-dependencies/pom.xml?rev=1463295&r1=1463294&r2=1463295&view=diff
==============================================================================
---
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-dependencies/pom.xml
(original)
+++
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-dependencies/pom.xml
Mon Apr 1 20:41:08 2013
@@ -49,6 +49,10 @@
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-frontend-jaxrs</artifactId>
+ </exclusion>
</exclusions>
</dependency>
