Merge "Bug 509440 - Fix warnings in build.properties"
diff --git a/bundles/org.eclipse.wst.json.core/build.properties b/bundles/org.eclipse.wst.json.core/build.properties
index c7d7c9d..d6f2a5d 100644
--- a/bundles/org.eclipse.wst.json.core/build.properties
+++ b/bundles/org.eclipse.wst.json.core/build.properties
@@ -9,8 +9,4 @@
                schemastore/

 src.includes = schema/,\

                schemastore/,\

-               plugin.xml,\

-               build.properties,\

-               plugin.properties,\

-               META-INF/,\

                Resource/

diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/build.properties b/docs/org.eclipse.jst.jsp.ui.infopop/build.properties
index ea7d118..f810593 100644
--- a/docs/org.eclipse.jst.jsp.ui.infopop/build.properties
+++ b/docs/org.eclipse.jst.jsp.ui.infopop/build.properties
@@ -10,9 +10,7 @@
                plugin.properties,\
                plugin.xml,\
                plugin.properties
-src.includes = plugin.xml,\
-               EditorJspContexts.xml,\
+src.includes = EditorJspContexts.xml,\
                EditorJspContexts2.xml,\
-               about.html,\
-               plugin.properties
+               about.html
 generateSourceBundle=false
diff --git a/docs/org.eclipse.wst.doc.user/build.properties b/docs/org.eclipse.wst.doc.user/build.properties
index fd7bb54..1fe8f15 100644
--- a/docs/org.eclipse.wst.doc.user/build.properties
+++ b/docs/org.eclipse.wst.doc.user/build.properties
@@ -12,12 +12,8 @@
                book.css,\
                commonrtl.css
 src.includes = about.html,\
-               plugin.properties,\
-               plugin.xml,\
                book.css,\
                common.css,\
-               commontr.css,\
-               commontl.css,\
                images/,\
                notices.html,\
                reference_toc.xml,\
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/build.properties b/docs/org.eclipse.wst.dtd.ui.infopop/build.properties
index d01e3a4..e727206 100644
--- a/docs/org.eclipse.wst.dtd.ui.infopop/build.properties
+++ b/docs/org.eclipse.wst.dtd.ui.infopop/build.properties
@@ -4,9 +4,7 @@
                EditorDtdContexts.xml,\
                META-INF/,\
                EditorDtdContexts2.xml
-src.includes = plugin.xml,\
-               about.html,\
-               plugin.properties,\
+src.includes = about.html,\
                EditorDtdContexts.xml,\
                EditorDtdContexts2.xml
 generateSourceBundle=false
diff --git a/docs/org.eclipse.wst.html.ui.infopop/build.properties b/docs/org.eclipse.wst.html.ui.infopop/build.properties
index 164ad79..38776f5 100644
--- a/docs/org.eclipse.wst.html.ui.infopop/build.properties
+++ b/docs/org.eclipse.wst.html.ui.infopop/build.properties
@@ -5,8 +5,6 @@
                EditorHtmlContexts2.xml,\
                plugin.properties
 src.includes = about.html,\
-               plugin.properties,\
-               plugin.xml,\
                EditorHtmlContexts.xml,\
                EditorHtmlContexts2.xml
 generateSourceBundle=false
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/build.properties b/docs/org.eclipse.wst.sse.ui.infopop/build.properties
index 3a66ffa..c698444 100644
--- a/docs/org.eclipse.wst.sse.ui.infopop/build.properties
+++ b/docs/org.eclipse.wst.sse.ui.infopop/build.properties
@@ -4,9 +4,7 @@
                META-INF/,\
                EditorCssContexts2.xml,\
                plugin.properties
-src.includes = plugin.xml,\
-               plugin.properties,\
-               about.html,\
+src.includes = about.html,\
                EditorContexts.xml,\
                EditorCssContexts2.xml
 generateSourceBundle=false
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/build.properties b/docs/org.eclipse.wst.xml.ui.infopop/build.properties
index de5c2e4..beac92b 100644
--- a/docs/org.eclipse.wst.xml.ui.infopop/build.properties
+++ b/docs/org.eclipse.wst.xml.ui.infopop/build.properties
@@ -8,9 +8,7 @@
                TableTree.xml,\
                WSDLContexts.xml,\
                XSDContexts.xml
-src.includes = plugin.xml,\
-               plugin.properties,\
-               about.html,\
+src.includes = about.html,\
                EditorXmlContexts.xml,\
                EditorXmlContexts2.xml,\
                TableTree.xml,\
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/build.properties b/docs/org.eclipse.wst.xmleditor.doc.user/build.properties
index 9f51d54..41c1ef6 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/build.properties
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/build.properties
@@ -7,8 +7,7 @@
                index/,\
                META-INF/,\
                plugin.properties
-src.includes = build.properties,\
-		       *.maplist,\
+src.includes = *.maplist,\
                *.ditamap,\
 		       topics/*.dita
 bin.excludes = DocBuild.xml,\
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/build.properties b/docs/org.eclipse.wst.xsdeditor.doc.user/build.properties
index 695623e..a61b33b 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/build.properties
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/build.properties
@@ -7,8 +7,7 @@
                index/,\
                META-INF/,\
                plugin.properties
-src.includes = build.properties,\
-		       *.maplist,\
+src.includes = *.maplist,\
                *.ditamap,\
 		       topics/*.dita
 bin.excludes = DocBuild.xml,\
diff --git a/tests/org.eclipse.wst.jsdt.web.ui.tests/build.properties b/tests/org.eclipse.wst.jsdt.web.ui.tests/build.properties
index 30d5673..5653de4 100644
--- a/tests/org.eclipse.wst.jsdt.web.ui.tests/build.properties
+++ b/tests/org.eclipse.wst.jsdt.web.ui.tests/build.properties
@@ -6,4 +6,5 @@
                test.xml,\
                OSGI-INF/l10n/,\
                about.html,\
-               testFiles/
+               testFiles/,\
+               OSGI-INF/