Bug 460084 - Fix invalid references to non-existant files

This will allow easier migration to tycho builds in the future

Change-Id: Ie24dcd6c0201262629ea1b164dd5b97a99fc8fe7
Signed-off-by: Mat Booth <mat.booth@redhat.com>

41 files changed, 46 insertions, 128 deletions

diff --git a/releng/features/org.eclipse.ecf.console.feature/build.properties b/releng/features/org.eclipse.ecf.console.feature/build.properties
index 0769153e4..65fe4c882 100644
--- a/releng/features/org.eclipse.ecf.console.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.console.feature/build.properties
@@ -1,5 +1,4 @@
 bin.includes = feature.xml,\
-               notice.html,\
                license.html,\
                feature.properties,\
                epl-v10.html,\
@@ -8,5 +7,4 @@ src.includes = about.html,\
                feature.properties,\
                feature.xml,\
                license.html,\
-               notice.html,\
                epl-v10.html
diff --git a/releng/features/org.eclipse.ecf.core.feature/build.properties b/releng/features/org.eclipse.ecf.core.feature/build.properties
index 3ef964f16..5b80ac585 100644
--- a/releng/features/org.eclipse.ecf.core.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.core.feature/build.properties
@@ -2,10 +2,8 @@ bin.includes = feature.xml,\
                about.html,\
                epl-v10.html,\
                license.html,\
-               notice.html,\
                feature.properties
-src.includes = notice.html,\
-               license.html,\
+src.includes = license.html,\
                epl-v10.html,\
                about.html,\
                feature.properties,\
diff --git a/releng/features/org.eclipse.ecf.core.featurepatch/build.properties b/releng/features/org.eclipse.ecf.core.featurepatch/build.properties
index effe05f75..b50ddbf26 100644
--- a/releng/features/org.eclipse.ecf.core.featurepatch/build.properties
+++ b/releng/features/org.eclipse.ecf.core.featurepatch/build.properties
@@ -2,13 +2,10 @@ bin.includes = feature.xml,\
                feature.properties,\
                license.html,\
                epl-v10.html,\
-               about.html,\
-               notice.html
+               about.html
 src.includes = feature.properties,\
                feature.xml,\
                license.html,\
                about.html,\
-               epl-v10.html,\
-               notice.html
-generate.feature@org.eclipse.ecf.core.featurepatch.source=org.eclipse.ecf.core.featurepatch            
-               
\ No newline at end of file
+               epl-v10.html
+generate.feature@org.eclipse.ecf.core.featurepatch.source=org.eclipse.ecf.core.featurepatch
diff --git a/releng/features/org.eclipse.ecf.core.ssl.feature/build.properties b/releng/features/org.eclipse.ecf.core.ssl.feature/build.properties
index 1f81066d3..297013292 100644
--- a/releng/features/org.eclipse.ecf.core.ssl.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.core.ssl.feature/build.properties
@@ -1,11 +1,9 @@
 bin.includes = feature.xml,\
                about.html,\
                license.html,\
-               notice.html,\
                feature.properties,\
                epl-v10.html
-src.includes = notice.html,\
-               license.html,\
+src.includes = license.html,\
                feature.xml,\
                about.html,\
                feature.properties,\
diff --git a/releng/features/org.eclipse.ecf.core/build.properties b/releng/features/org.eclipse.ecf.core/build.properties
index 291d4ba58..35d1bf196 100644
--- a/releng/features/org.eclipse.ecf.core/build.properties
+++ b/releng/features/org.eclipse.ecf.core/build.properties
@@ -3,13 +3,11 @@ bin.includes = feature.xml,\
                asl-v20.txt,\
                license.html,\
                feature.properties,\
-               epl-v10.html,\
-               notice.html
+               epl-v10.html
 src.includes = feature.xml,\
                about.html,\
                asl-v20.txt,\
                license.html,\
-               notice.html,\
                feature.properties,\
                epl-v10.html
 generate.feature@org.eclipse.ecf.core.source=org.eclipse.ecf.core               
diff --git a/releng/features/org.eclipse.ecf.datashare.feature/build.properties b/releng/features/org.eclipse.ecf.datashare.feature/build.properties
index 5f7422678..eaee7e1c1 100644
--- a/releng/features/org.eclipse.ecf.datashare.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.datashare.feature/build.properties
@@ -2,11 +2,9 @@ bin.includes = feature.xml,\
                feature.properties,\
                about.html,\
                license.html,\
-               notice.html,\
                epl-v10.html
 src.includes = license.html,\
                feature.xml,\
                feature.properties,\
                about.html,\
-               notice.html,\
                epl-v10.html
diff --git a/releng/features/org.eclipse.ecf.discovery.dnssd.feature/build.properties b/releng/features/org.eclipse.ecf.discovery.dnssd.feature/build.properties
index 2a8b18a3f..809ed51d5 100644
--- a/releng/features/org.eclipse.ecf.discovery.dnssd.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.discovery.dnssd.feature/build.properties
@@ -1,5 +1,4 @@
 bin.includes = feature.xml,\
-               notice.html,\
                license.html,\
                feature.properties,\
                about.html,\
@@ -8,5 +7,4 @@ src.includes = about.html,\
                feature.properties,\
                feature.xml,\
                license.html,\
-               notice.html,\
                epl-v10.html
diff --git a/releng/features/org.eclipse.ecf.discovery.feature/build.properties b/releng/features/org.eclipse.ecf.discovery.feature/build.properties
index 5473dbff6..55d085780 100644
--- a/releng/features/org.eclipse.ecf.discovery.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.discovery.feature/build.properties
@@ -1,11 +1,9 @@
 bin.includes = feature.xml,\
                license.html,\
-               notice.html,\
                about.html,\
                feature.properties,\
                epl-v10.html
-src.includes = notice.html,\
-               license.html,\
+src.includes = license.html,\
                feature.xml,\
                feature.properties,\
                about.html,\
diff --git a/releng/features/org.eclipse.ecf.discovery.jmdns.feature/build.properties b/releng/features/org.eclipse.ecf.discovery.jmdns.feature/build.properties
index 93b570a73..84f890384 100644
--- a/releng/features/org.eclipse.ecf.discovery.jmdns.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.discovery.jmdns.feature/build.properties
@@ -2,10 +2,8 @@ bin.includes = feature.xml,\
                about.html,\
                feature.properties,\
                license.html,\
-               notice.html,\
                epl-v10.html
-src.includes = notice.html,\
-               license.html,\
+src.includes = license.html,\
                feature.xml,\
                feature.properties,\
                about.html,\
diff --git a/releng/features/org.eclipse.ecf.discovery.slp.feature/build.properties b/releng/features/org.eclipse.ecf.discovery.slp.feature/build.properties
index 2a8b18a3f..809ed51d5 100644
--- a/releng/features/org.eclipse.ecf.discovery.slp.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.discovery.slp.feature/build.properties
@@ -1,5 +1,4 @@
 bin.includes = feature.xml,\
-               notice.html,\
                license.html,\
                feature.properties,\
                about.html,\
@@ -8,5 +7,4 @@ src.includes = about.html,\
                feature.properties,\
                feature.xml,\
                license.html,\
-               notice.html,\
                epl-v10.html
diff --git a/releng/features/org.eclipse.ecf.discovery.zookeeper.feature/build.properties b/releng/features/org.eclipse.ecf.discovery.zookeeper.feature/build.properties
index aac458bae..4199f5bb0 100644
--- a/releng/features/org.eclipse.ecf.discovery.zookeeper.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.discovery.zookeeper.feature/build.properties
@@ -3,12 +3,10 @@ bin.includes = feature.xml,\
                asl-v20.txt,\
                feature.properties,\
                license.html,\
-               epl-v10.html,\
-               notice.html
+               epl-v10.html
 src.includes = feature.xml,\
                feature.properties,\
                about.html,\
                asl-v20.txt,\
                license.html,\
-               epl-v10.html,\
-               notice.html
+               epl-v10.html
diff --git a/releng/features/org.eclipse.ecf.docshare.feature/build.properties b/releng/features/org.eclipse.ecf.docshare.feature/build.properties
index 748532e0f..bddaeffc0 100644
--- a/releng/features/org.eclipse.ecf.docshare.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.docshare.feature/build.properties
@@ -2,10 +2,8 @@ bin.includes = feature.xml,\
                about.html,\
                epl-v10.html,\
                feature.properties,\
-               notice.html,\
                license.html
-src.includes = notice.html,\
-               license.html,\
+src.includes = license.html,\
                feature.xml,\
                feature.properties,\
                epl-v10.html,\
diff --git a/releng/features/org.eclipse.ecf.eventadmin.examples.feature/build.properties b/releng/features/org.eclipse.ecf.eventadmin.examples.feature/build.properties
index 93b570a73..84f890384 100644
--- a/releng/features/org.eclipse.ecf.eventadmin.examples.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.eventadmin.examples.feature/build.properties
@@ -2,10 +2,8 @@ bin.includes = feature.xml,\
                about.html,\
                feature.properties,\
                license.html,\
-               notice.html,\
                epl-v10.html
-src.includes = notice.html,\
-               license.html,\
+src.includes = license.html,\
                feature.xml,\
                feature.properties,\
                about.html,\
diff --git a/releng/features/org.eclipse.ecf.eventadmin.feature/build.properties b/releng/features/org.eclipse.ecf.eventadmin.feature/build.properties
index 93b570a73..84f890384 100644
--- a/releng/features/org.eclipse.ecf.eventadmin.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.eventadmin.feature/build.properties
@@ -2,10 +2,8 @@ bin.includes = feature.xml,\
                about.html,\
                feature.properties,\
                license.html,\
-               notice.html,\
                epl-v10.html
-src.includes = notice.html,\
-               license.html,\
+src.includes = license.html,\
                feature.xml,\
                feature.properties,\
                about.html,\
diff --git a/releng/features/org.eclipse.ecf.filetransfer.feature/build.properties b/releng/features/org.eclipse.ecf.filetransfer.feature/build.properties
index fabac7c50..41592bcce 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.filetransfer.feature/build.properties
@@ -1,13 +1,11 @@
 bin.includes = feature.xml,\
                feature.properties,\
                license.html,\
-               notice.html,\
                epl-v10.html,\
                asl-v20.txt,\
                about.html
 src.includes = feature.properties,\
                feature.xml,\
-               notice.html,\
                license.html,\
                epl-v10.html,\
                asl-v20.txt,\
diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/build.properties b/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/build.properties
index 54ad2e843..1fdb630b4 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/build.properties
@@ -3,12 +3,10 @@ bin.includes = feature.xml,\
                asl-v20.txt,\
                build.properties,\
                feature.properties,\
-               license.html,\
-               notice.html
+               license.html
 src.includes = about.html,\
                asl-v20.txt,\
                build.properties,\
                feature.properties,\
                feature.xml,\
-               license.html,\
-               notice.html
+               license.html
diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient.ssl.feature/build.properties b/releng/features/org.eclipse.ecf.filetransfer.httpclient.ssl.feature/build.properties
index 51ac02c47..8722e52c4 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.httpclient.ssl.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient.ssl.feature/build.properties
@@ -2,11 +2,9 @@ bin.includes = feature.xml,\
                about.html,\
                asl-v20.txt,\
                feature.properties,\
-               license.html,\
-               notice.html
+               license.html
 src.includes = about.html,\
                asl-v20.txt,\
                feature.properties,\
                feature.xml,\
-               license.html,\
-               notice.html
+               license.html
diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/build.properties b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/build.properties
index a17419aa4..50026c15f 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/build.properties
@@ -3,10 +3,8 @@ bin.includes = feature.xml,\
                asl-v20.txt,\
                epl-v10.html,\
                feature.properties,\
-               license.html,\
-               notice.html
-src.includes = notice.html,\
-               license.html,\
+               license.html
+src.includes = license.html,\
                feature.xml,\
                feature.properties,\
                epl-v10.html,\
diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature/build.properties b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature/build.properties
index f9554d514..c9a54c9d0 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature/build.properties
@@ -3,10 +3,8 @@ bin.includes = feature.xml,\
                asl-v20.txt,\
                feature.properties,\
                license.html,\
-               notice.html,\
                epl-v10.html
-src.includes = notice.html,\
-               license.html,\
+src.includes = license.html,\
                feature.xml,\
                feature.properties,\
                asl-v20.txt,\
diff --git a/releng/features/org.eclipse.ecf.filetransfer.p2.feature/build.properties b/releng/features/org.eclipse.ecf.filetransfer.p2.feature/build.properties
index 248759e8b..c1e1a0839 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.p2.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.filetransfer.p2.feature/build.properties
@@ -3,12 +3,10 @@ bin.includes = feature.xml,\
                asl-v20.txt,\
                epl-v10.html,\
                feature.properties,\
-               license.html,\
-               notice.html
+               license.html
 src.includes = about.html,\
                asl-v20.txt,\
                epl-v10.html,\
                feature.properties,\
                feature.xml,\
-               license.html,\
-               notice.html
+               license.html
diff --git a/releng/features/org.eclipse.ecf.filetransfer.ssl.feature/build.properties b/releng/features/org.eclipse.ecf.filetransfer.ssl.feature/build.properties
index c503dd06a..bddaeffc0 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.ssl.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.filetransfer.ssl.feature/build.properties
@@ -2,10 +2,8 @@ bin.includes = feature.xml,\
                about.html,\
                epl-v10.html,\
                feature.properties,\
-               license.html,\
-               notice.html
-src.includes = notice.html,\
-               license.html,\
+               license.html
+src.includes = license.html,\
                feature.xml,\
                feature.properties,\
                epl-v10.html,\
diff --git a/releng/features/org.eclipse.ecf.osgi.services.feature/build.properties b/releng/features/org.eclipse.ecf.osgi.services.feature/build.properties
index 93b570a73..84f890384 100644
--- a/releng/features/org.eclipse.ecf.osgi.services.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.osgi.services.feature/build.properties
@@ -2,10 +2,8 @@ bin.includes = feature.xml,\
                about.html,\
                feature.properties,\
                license.html,\
-               notice.html,\
                epl-v10.html
-src.includes = notice.html,\
-               license.html,\
+src.includes = license.html,\
                feature.xml,\
                feature.properties,\
                about.html,\
diff --git a/releng/features/org.eclipse.ecf.presence.feature/build.properties b/releng/features/org.eclipse.ecf.presence.feature/build.properties
index 0f3b77653..dd02a9d25 100644
--- a/releng/features/org.eclipse.ecf.presence.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.presence.feature/build.properties
@@ -1,6 +1,5 @@
 bin.includes = feature.xml,\
                license.html,\
-               notice.html,\
                feature.properties,\
                epl-v10.html,\
                about.html
@@ -8,5 +7,4 @@ src.includes = about.html,\
                epl-v10.html,\
                feature.properties,\
                feature.xml,\
-               license.html,\
-               notice.html
+               license.html
diff --git a/releng/features/org.eclipse.ecf.provider.generic.datashare.feature/build.properties b/releng/features/org.eclipse.ecf.provider.generic.datashare.feature/build.properties
index c503dd06a..bddaeffc0 100644
--- a/releng/features/org.eclipse.ecf.provider.generic.datashare.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.provider.generic.datashare.feature/build.properties
@@ -2,10 +2,8 @@ bin.includes = feature.xml,\
                about.html,\
                epl-v10.html,\
                feature.properties,\
-               license.html,\
-               notice.html
-src.includes = notice.html,\
-               license.html,\
+               license.html
+src.includes = license.html,\
                feature.xml,\
                feature.properties,\
                epl-v10.html,\
diff --git a/releng/features/org.eclipse.ecf.provider.generic.feature/build.properties b/releng/features/org.eclipse.ecf.provider.generic.feature/build.properties
index c503dd06a..bddaeffc0 100644
--- a/releng/features/org.eclipse.ecf.provider.generic.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.provider.generic.feature/build.properties
@@ -2,10 +2,8 @@ bin.includes = feature.xml,\
                about.html,\
                epl-v10.html,\
                feature.properties,\
-               license.html,\
-               notice.html
-src.includes = notice.html,\
-               license.html,\
+               license.html
+src.includes = license.html,\
                feature.xml,\
                feature.properties,\
                epl-v10.html,\
diff --git a/releng/features/org.eclipse.ecf.provider.generic.remoteservice.feature/build.properties b/releng/features/org.eclipse.ecf.provider.generic.remoteservice.feature/build.properties
index 3328d07e9..b3e036aec 100644
--- a/releng/features/org.eclipse.ecf.provider.generic.remoteservice.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.provider.generic.remoteservice.feature/build.properties
@@ -2,11 +2,9 @@ bin.includes = feature.xml,\
                about.html,\
                epl-v10.html,\
                feature.properties,\
-               license.html,\
-               notice.html
+               license.html
 src.includes = about.html,\
                epl-v10.html,\
                feature.properties,\
                license.html,\
-               feature.xml,\
-               notice.html
+               feature.xml
diff --git a/releng/features/org.eclipse.ecf.remoteservice.examples.feature/build.properties b/releng/features/org.eclipse.ecf.remoteservice.examples.feature/build.properties
index 9a3fdd1e9..23a2345f1 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.examples.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.remoteservice.examples.feature/build.properties
@@ -2,10 +2,8 @@ bin.includes = feature.xml,\
                about.html,\
                feature.properties,\
                license.html,\
-               notice.html,\
                epl-v10.html
-src.includes = notice.html,\
-               license.html,\
+src.includes = license.html,\
                feature.properties,\
                about.html,\
                epl-v10.html,\
diff --git a/releng/features/org.eclipse.ecf.remoteservice.feature/build.properties b/releng/features/org.eclipse.ecf.remoteservice.feature/build.properties
index 421d6e64d..84f890384 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.remoteservice.feature/build.properties
@@ -2,10 +2,8 @@ bin.includes = feature.xml,\
                about.html,\
                feature.properties,\
                license.html,\
-               notice.html,\
                epl-v10.html
 src.includes = license.html,\
-               notice.html,\
                feature.xml,\
                feature.properties,\
                about.html,\
diff --git a/releng/features/org.eclipse.ecf.remoteservice.rest.feature/build.properties b/releng/features/org.eclipse.ecf.remoteservice.rest.feature/build.properties
index e13a92d01..84f890384 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.rest.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.remoteservice.rest.feature/build.properties
@@ -2,11 +2,9 @@ bin.includes = feature.xml,\
                about.html,\
                feature.properties,\
                license.html,\
-               notice.html,\
                epl-v10.html
 src.includes = license.html,\
                feature.xml,\
-               notice.html,\
                feature.properties,\
                about.html,\
                epl-v10.html
diff --git a/releng/features/org.eclipse.ecf.remoteservice.rest.synd.feature/build.properties b/releng/features/org.eclipse.ecf.remoteservice.rest.synd.feature/build.properties
index c503dd06a..bddaeffc0 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.rest.synd.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.remoteservice.rest.synd.feature/build.properties
@@ -2,10 +2,8 @@ bin.includes = feature.xml,\
                about.html,\
                epl-v10.html,\
                feature.properties,\
-               license.html,\
-               notice.html
-src.includes = notice.html,\
-               license.html,\
+               license.html
+src.includes = license.html,\
                feature.xml,\
                feature.properties,\
                epl-v10.html,\
diff --git a/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/build.properties b/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/build.properties
index 93b570a73..84f890384 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/build.properties
@@ -2,10 +2,8 @@ bin.includes = feature.xml,\
                about.html,\
                feature.properties,\
                license.html,\
-               notice.html,\
                epl-v10.html
-src.includes = notice.html,\
-               license.html,\
+src.includes = license.html,\
                feature.xml,\
                feature.properties,\
                about.html,\
diff --git a/releng/features/org.eclipse.ecf.remoteservice.rpc.feature/build.properties b/releng/features/org.eclipse.ecf.remoteservice.rpc.feature/build.properties
index d9db8e3c6..3e2b5126a 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.rpc.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.remoteservice.rpc.feature/build.properties
@@ -9,5 +9,4 @@ bin.includes = feature.xml,\
                about.html,\
                epl-v10.html,\
                feature.properties,\
-               license.html,\
-               notice.html
+               license.html
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.examples.feature/build.properties b/releng/features/org.eclipse.ecf.remoteservice.sdk.examples.feature/build.properties
index be764c49b..2ee656d9c 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.sdk.examples.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.examples.feature/build.properties
@@ -1,5 +1,4 @@
 bin.includes = feature.xml,\
-               notice.html,\
                license.html,\
                feature.properties,\
                epl-v10.html,\
@@ -8,6 +7,5 @@ src.includes = about.html,\
                epl-v10.html,\
                feature.properties,\
                feature.xml,\
-               license.html,\
-               notice.html
+               license.html
 generate.feature@org.eclipse.ecf.remoteservice.sdk.examples.source.feature=org.eclipse.ecf.remoteservice.sdk.examples.feature
\ No newline at end of file
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/build.properties b/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/build.properties
index 658e177cf..2e0d80390 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/build.properties
@@ -2,10 +2,8 @@ bin.includes = feature.xml,\
                about.html,\
                feature.properties,\
                license.html,\
-               notice.html,\
                epl-v10.html
-src.includes = notice.html,\
-               license.html,\
+src.includes = license.html,\
                feature.properties,\
                feature.xml,\
                about.html,\
diff --git a/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/build.properties b/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/build.properties
index ad3dc8998..dd02a9d25 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/build.properties
@@ -1,5 +1,4 @@
 bin.includes = feature.xml,\
-               notice.html,\
                license.html,\
                feature.properties,\
                epl-v10.html,\
@@ -8,5 +7,4 @@ src.includes = about.html,\
                epl-v10.html,\
                feature.properties,\
                feature.xml,\
-               license.html,\
-               notice.html
+               license.html
diff --git a/releng/features/org.eclipse.ecf.remoteservice.soa.feature/build.properties b/releng/features/org.eclipse.ecf.remoteservice.soa.feature/build.properties
index 048f3035d..3f0bf09d4 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.soa.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.remoteservice.soa.feature/build.properties
@@ -1,10 +1,8 @@
 bin.includes = feature.xml,\
                epl-v10.html,\
                license.html,\
-               notice.html,\
                feature.properties
 src.includes = epl-v10.html,\
-               notice.html,\
                license.html,\
                feature.xml,\
                feature.properties
diff --git a/releng/features/org.eclipse.ecf.remoteservice.soap.feature/build.properties b/releng/features/org.eclipse.ecf.remoteservice.soap.feature/build.properties
index b19ce1cfe..18b11809d 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.soap.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.remoteservice.soap.feature/build.properties
@@ -2,10 +2,8 @@ bin.includes = feature.xml,\
                about.html,\
                feature.properties,\
                license.html,\
-               notice.html,\
                epl-v10.html
-src.includes = notice.html,\
-               license.html,\
+src.includes = license.html,\
                feature.xml,\
                build.properties,\
                about.html,\
diff --git a/releng/features/org.eclipse.ecf.sharedobject.feature/build.properties b/releng/features/org.eclipse.ecf.sharedobject.feature/build.properties
index c503dd06a..bddaeffc0 100644
--- a/releng/features/org.eclipse.ecf.sharedobject.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.sharedobject.feature/build.properties
@@ -2,10 +2,8 @@ bin.includes = feature.xml,\
                about.html,\
                epl-v10.html,\
                feature.properties,\
-               license.html,\
-               notice.html
-src.includes = notice.html,\
-               license.html,\
+               license.html
+src.includes = license.html,\
                feature.xml,\
                feature.properties,\
                epl-v10.html,\
diff --git a/releng/features/org.eclipse.ecf.tests.feature/build.properties b/releng/features/org.eclipse.ecf.tests.feature/build.properties
index c6d21f22f..d70edb6cb 100644
--- a/releng/features/org.eclipse.ecf.tests.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.tests.feature/build.properties
@@ -1,10 +1,8 @@
 bin.includes = feature.xml,\
                epl-v10.html,\
                feature.properties,\
-               notice.html,\
                license.html
 src.includes = epl-v10.html,\
                feature.properties,\
                feature.xml,\
-               license.html,\
-               notice.html
+               license.html
diff --git a/releng/features/org.eclipse.ecf.tests.filetransfer.feature/build.properties b/releng/features/org.eclipse.ecf.tests.filetransfer.feature/build.properties
index 9b37d9343..3f0bf09d4 100644
--- a/releng/features/org.eclipse.ecf.tests.filetransfer.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.tests.filetransfer.feature/build.properties
@@ -1,10 +1,8 @@
 bin.includes = feature.xml,\
                epl-v10.html,\
                license.html,\
-               feature.properties,\
-               notice.html
+               feature.properties
 src.includes = epl-v10.html,\
-               notice.html,\
                license.html,\
                feature.xml,\
                feature.properties
diff --git a/releng/features/org.eclipse.ecf.xmpp.feature/build.properties b/releng/features/org.eclipse.ecf.xmpp.feature/build.properties
index a70d27571..cba793a20 100644
--- a/releng/features/org.eclipse.ecf.xmpp.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.xmpp.feature/build.properties
@@ -1,11 +1,9 @@
 bin.includes = feature.xml,\
                license.html,\
-               notice.html,\
                about.html,\
                epl-v10.html,\
                feature.properties
-src.includes = notice.html,\
-               license.html,\
+src.includes = license.html,\
                feature.xml,\
                about.html,\
                epl-v10.html,\