Author: bdelacretaz
Date: Wed Jun 4 00:50:09 2008
New Revision: 663021
URL: http://svn.apache.org/viewvc?rev=663021&view=rev
Log:
SLING-493 - module.notice.txt is now used as a list of additional dependencies
Modified:
incubator/sling/trunk/etc/notice/mknotice
incubator/sling/trunk/etc/notice/noticemap.txt
Modified: incubator/sling/trunk/etc/notice/mknotice
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/mknotice?rev=663021&r1=663020&r2=663021&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/mknotice (original)
+++ incubator/sling/trunk/etc/notice/mknotice Wed Jun 4 00:50:09 2008
@@ -60,6 +60,7 @@
| grep -v 'Finished at:' \
| egrep -v "$NO_NOTICE_FILTER" | awk -F' ' '{ print $2 }' \
| cut -d':' -f1-2
+ [[ -f $LOCAL_NOTICE ]] && egrep '^[^#]' $LOCAL_NOTICE
}
# Map a list of dependencies to their notice files
@@ -107,7 +108,6 @@
echo ""
echo ""
done
- [[ -f $LOCAL_NOTICE ]] && cat $LOCAL_NOTICE
) | egrep '^($|[^#])' | cat -s
}
Modified: incubator/sling/trunk/etc/notice/noticemap.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/noticemap.txt?rev=663021&r1=663020&r2=663021&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/noticemap.txt (original)
+++ incubator/sling/trunk/etc/notice/noticemap.txt Wed Jun 4 00:50:09 2008
@@ -21,7 +21,7 @@
javax.servlet.jsp:jsp-api=NO_NOTICE
javax.servlet:jsp-api=NO_NOTICE
-# third-party
+# third-party
junit:junit=junit.txt
org.eclipse.equinox.http:servlet=equinox.txt
org.slf4j:jcl104-over-slf4j=slf4j.txt
@@ -57,3 +57,6 @@
org.hamcrest:hamcrest-library=hamcrest.txt
biz.aQute:bndlib=bnd.txt
org.jmock:jmock=jmock.txt
+
+# dojo license is BSD: http://dojotoolkit.org/foundation/#license
+dojo:dojo-release=NO_NOTICE
\ No newline at end of file
