copy news and about resource to set.feature

TruongQuangSB · Feb 1, 2024 · 53a8b33 · 53a8b33
1 parent bbdfa2b
commit 53a8b33
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 15 deletions.
diff --git 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
+bin.includes = feature.xml
diff --git 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
@@ -1,2 +1 @@
-bin.includes = feature.xml
-root=news
+bin.includes = feature.xml
diff --git 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
@@ -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
@@ -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"/>