incubator-wink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r831993 - in /incubator/wink/trunk: wink-assembly/wink-assembly-dist/src/main/assembly/distbin.xml wink-providers/wink-abdera-provider/pom.xml wink-scripts/wink-dist/binarydist/LICENSE wink-scripts/wink-dist/binarydist/NOTICE
Date Mon, 02 Nov 2009 18:11:55 GMT
Author: bluk
Date: Mon Nov  2 18:11:55 2009
New Revision: 831993

URL: http://svn.apache.org/viewvc?rev=831993&view=rev
Log:
Do not redistribute Abdera

Removed Abdera related NOTICEs and LICENSEs.

Modified:
    incubator/wink/trunk/wink-assembly/wink-assembly-dist/src/main/assembly/distbin.xml
    incubator/wink/trunk/wink-providers/wink-abdera-provider/pom.xml
    incubator/wink/trunk/wink-scripts/wink-dist/binarydist/LICENSE
    incubator/wink/trunk/wink-scripts/wink-dist/binarydist/NOTICE

Modified: incubator/wink/trunk/wink-assembly/wink-assembly-dist/src/main/assembly/distbin.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-assembly/wink-assembly-dist/src/main/assembly/distbin.xml?rev=831993&r1=831992&r2=831993&view=diff
==============================================================================
--- incubator/wink/trunk/wink-assembly/wink-assembly-dist/src/main/assembly/distbin.xml (original)
+++ incubator/wink/trunk/wink-assembly/wink-assembly-dist/src/main/assembly/distbin.xml Mon
Nov  2 18:11:55 2009
@@ -69,14 +69,6 @@
             <useStrictFiltering>true</useStrictFiltering>
         </dependencySet>
         <dependencySet>
-            <includes>
-                <include>org.apache.abdera:*</include>
-                <include>org.apache.ws.commons.axiom:*</include>
-                <include>commons-codec:commons-codec</include>
-                <include>nu.validator.htmlparser:htmlparser</include>
-                <include>jaxen:jaxen</include>
-                <include>org.codehaus.woodstox:wstx-asl</include>
-            </includes>
             <useProjectArtifact>false</useProjectArtifact>
             <outputDirectory>ext/wink-abdera-provider/lib</outputDirectory>
             <useStrictFiltering>true</useStrictFiltering>

Modified: incubator/wink/trunk/wink-providers/wink-abdera-provider/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-abdera-provider/pom.xml?rev=831993&r1=831992&r2=831993&view=diff
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-abdera-provider/pom.xml (original)
+++ incubator/wink/trunk/wink-providers/wink-abdera-provider/pom.xml Mon Nov  2 18:11:55 2009
@@ -39,6 +39,7 @@
                     <artifactId>geronimo-activation_1.0.2_spec</artifactId>
                 </exclusion>
             </exclusions>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
@@ -70,6 +71,7 @@
                     <artifactId>xercesImpl</artifactId>
                 </exclusion>
             </exclusions>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.wink</groupId>

Modified: incubator/wink/trunk/wink-scripts/wink-dist/binarydist/LICENSE
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-scripts/wink-dist/binarydist/LICENSE?rev=831993&r1=831992&r2=831993&view=diff
==============================================================================
--- incubator/wink/trunk/wink-scripts/wink-dist/binarydist/LICENSE (original)
+++ incubator/wink/trunk/wink-scripts/wink-dist/binarydist/LICENSE Mon Nov  2 18:11:55 2009
@@ -648,64 +648,6 @@
      WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
      
 --------------------------------------------------------------------------------
-htmlparser (http://about.validator.nu/htmlparser/) nu.validator.htmlparser:htmlparser:jar:1.0.5
-
-Copyright (c) 2005, 2006, 2007 Henri Sivonen
-Copyright (c) 2007-2008 Mozilla Foundation
-Portions of comments Copyright 2004-2007 Apple Computer, Inc., Mozilla 
-Foundation, and Opera Software ASA.    
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
---------------------------------------------------------------------------------
-Jaxen (http://jaxen.codehaus.org/) jaxen:jaxen:jar:1.1.1
-
-Copyright 2003-2006 The Werken Company. All Rights Reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  * 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.
-
-  * Neither the name of the Jaxen Project 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.
-
---------------------------------------------------------------------------------
 
 jcip-annotations (http://www.jcip.net/) net.jcip:jcip-annotations:jar:1.0
 Copyright (c) 2005 Brian Goetz and Tim Peierls and is released under the

Modified: incubator/wink/trunk/wink-scripts/wink-dist/binarydist/NOTICE
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-scripts/wink-dist/binarydist/NOTICE?rev=831993&r1=831992&r2=831993&view=diff
==============================================================================
--- incubator/wink/trunk/wink-scripts/wink-dist/binarydist/NOTICE (original)
+++ incubator/wink/trunk/wink-scripts/wink-dist/binarydist/NOTICE Mon Nov  2 18:11:55 2009
@@ -10,12 +10,6 @@
  
 This product includes software, JavaBeans Activation Framework (http://java.sun.com/javase/technologies/desktop/javabeans/jaf/)
distributed under CDDL Version 1.0 license
  
-This product includes software, Spring (http://www.springsource.org/) distributed under Apache-2.0
license
-
-This product includes software, Woodstox (http://woodstox.codehaus.org/) distributed under
Apache-2.0 license
-
-Portions of the included Apache Axiom library are Copyright 2006 International Business Machines
Corp.
-
 jcip-annotations is Copyright (c) 2005 Brian Goetz and Tim Peierls and is released under
the Creative
 Commons Attribution License (http://creativecommons.org/licenses/by/2.5).
 



Mime
View raw message