You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by bl...@apache.org on 2009/10/09 19:10:56 UTC

svn commit: r823620 - in /incubator/wink/trunk/wink-scripts/wink-dist: DEPENDENCIES build.xml

Author: bluk
Date: Fri Oct  9 17:10:56 2009
New Revision: 823620

URL: http://svn.apache.org/viewvc?rev=823620&view=rev
Log:
Fix DEPENDENCIES and NOTICE in combined wink.jar

Modified:
    incubator/wink/trunk/wink-scripts/wink-dist/DEPENDENCIES
    incubator/wink/trunk/wink-scripts/wink-dist/build.xml

Modified: incubator/wink/trunk/wink-scripts/wink-dist/DEPENDENCIES
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-scripts/wink-dist/DEPENDENCIES?rev=823620&r1=823619&r2=823620&view=diff
==============================================================================
--- incubator/wink/trunk/wink-scripts/wink-dist/DEPENDENCIES (original)
+++ incubator/wink/trunk/wink-scripts/wink-dist/DEPENDENCIES Fri Oct  9 17:10:56 2009
@@ -17,11 +17,6 @@
     License: GNU General Public Library  (http://www.gnu.org/licenses/gpl.txt)    License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0  (http://www.sun.com/cddl/cddl.html)
   - Unnamed - xerces:xercesImpl:jar:2.6.2  xerces:xercesImpl:jar:2.6.2
 
-
-From: 'JSON' (http://json.org/)
-  - JSON (JavaScript Object Notation) (http://www.json.org/java/index.html) org.json:json:jar:20080701
-    License: provided without support or warranty  (http://www.json.org/license.html)
-
 From: 'QOS.ch' (http://www.qos.ch)
   - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.5.8
 

Modified: incubator/wink/trunk/wink-scripts/wink-dist/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-scripts/wink-dist/build.xml?rev=823620&r1=823619&r2=823620&view=diff
==============================================================================
--- incubator/wink/trunk/wink-scripts/wink-dist/build.xml (original)
+++ incubator/wink/trunk/wink-scripts/wink-dist/build.xml Fri Oct  9 17:10:56 2009
@@ -269,11 +269,11 @@
                 <attribute name="X-Compile-Target-JDK" value="${maven.compile.target}" />
             </manifest>
 
-            <!--zipfileset dir="${basedir}" prefix="META-INF">
+            <zipfileset dir="${basedir}" prefix="META-INF">
                 <include name="NOTICE" />
                 <include name="DISCLAIMER" />
                 <include name="DEPENDENCIES" />
-            </zipfileset -->
+            </zipfileset>
         </jar>
         <delete dir="${tmp.unzip}" />
     </target>