From 53a8b33878f47f6df42ed98e79492d7c53ea01a8 Mon Sep 17 00:00:00 2001
From: "Quang.Truong" <Truong.Quang@scheidt-bachmann-st.de>
Date: Thu, 1 Feb 2024 11:43:40 +0100
Subject: [PATCH] copy news and about resource to set.feature

---
 .../org.eclipse.set.feature.license/build.properties      | 3 +--
 java/bundles/org.eclipse.set.feature.license/pom.xml      | 2 +-
 .../bundles/org.eclipse.set.feature.news/build.properties | 3 +--
 java/bundles/org.eclipse.set.feature.news/pom.xml         | 2 +-
 java/bundles/org.eclipse.set.feature/build.properties     | 2 +-
 java/bundles/org.eclipse.set.feature/feature.xml          | 8 --------
 6 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/java/bundles/org.eclipse.set.feature.license/build.properties b/java/bundles/org.eclipse.set.feature.license/build.properties
index 05b0292641..b045d39762 100644
--- a/java/bundles/org.eclipse.set.feature.license/build.properties
+++ b/java/bundles/org.eclipse.set.feature.license/build.properties
@@ -1,2 +1 @@
-bin.includes = feature.xml
-root=about
\ No newline at end of file
+bin.includes = feature.xml
\ No newline at end of file
diff --git a/java/bundles/org.eclipse.set.feature.license/pom.xml b/java/bundles/org.eclipse.set.feature.license/pom.xml
index d2988993d0..a4b910763b 100644
--- a/java/bundles/org.eclipse.set.feature.license/pom.xml
+++ b/java/bundles/org.eclipse.set.feature.license/pom.xml
@@ -29,7 +29,7 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${basedir}/about/web/about</outputDirectory>
+							<outputDirectory>${basedir}/../org.eclipse.set.feature/about/web/about</outputDirectory>
 							<resources>
 								<resource>
 									<directory>${basedir}/../../../web/about/dist</directory>
diff --git a/java/bundles/org.eclipse.set.feature.news/build.properties b/java/bundles/org.eclipse.set.feature.news/build.properties
index 3dcf62b735..b045d39762 100644
--- a/java/bundles/org.eclipse.set.feature.news/build.properties
+++ b/java/bundles/org.eclipse.set.feature.news/build.properties
@@ -1,2 +1 @@
-bin.includes = feature.xml
-root=news
\ No newline at end of file
+bin.includes = feature.xml
\ No newline at end of file
diff --git a/java/bundles/org.eclipse.set.feature.news/pom.xml b/java/bundles/org.eclipse.set.feature.news/pom.xml
index a046a94fe1..232dfb1276 100644
--- a/java/bundles/org.eclipse.set.feature.news/pom.xml
+++ b/java/bundles/org.eclipse.set.feature.news/pom.xml
@@ -29,7 +29,7 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${basedir}/news/web/news</outputDirectory>
+							<outputDirectory>${basedir}/../org.eclipse.set.feature/news/web/news</outputDirectory>
 							<resources>
 								<resource>
 									<directory>${basedir}/../../../web/news/public</directory>
diff --git a/java/bundles/org.eclipse.set.feature/build.properties b/java/bundles/org.eclipse.set.feature/build.properties
index 17e64cff97..a4cb28485f 100644
--- a/java/bundles/org.eclipse.set.feature/build.properties
+++ b/java/bundles/org.eclipse.set.feature/build.properties
@@ -1,2 +1,2 @@
 bin.includes = feature.xml
-root=rootdir, rootdir_filtered, textviewer, pdfviewer, siteplan, developerhelp
+root=rootdir, rootdir_filtered, textviewer, pdfviewer, siteplan, developerhelp, about, news
diff --git a/java/bundles/org.eclipse.set.feature/feature.xml b/java/bundles/org.eclipse.set.feature/feature.xml
index e0fd3a6c67..8e401e6c81 100644
--- a/java/bundles/org.eclipse.set.feature/feature.xml
+++ b/java/bundles/org.eclipse.set.feature/feature.xml
@@ -19,14 +19,6 @@ which accompanies this distribution, and is available at
 http://www.eclipse.org/legal/epl-v20.html
    </copyright>
 
-   <includes
-         id="org.eclipse.set.feature.news"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.set.feature.license"
-         version="0.0.0"/>
-
    <requires>
       <import feature="org.eclipse.babel.nls_eclipse_de" version="4.4.0.v20140623020002"/>
       <import plugin="javax.inject" version="1.0.0" match="greaterOrEqual"/>