Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Rubezhny2016-01-22 13:20:50 -0500
committerVictor Rubezhny2016-01-22 14:36:43 -0500
commit1511503b60fb8900ca4082131715a85e1cd78656 (patch)
treef67b45403e3bef19d5db84e525a0b5c718257363 /features
parent9a3942136d222e5249d788e09c3ed73c31d5aaed (diff)
downloadwebtools.sourceediting-1511503b60fb8900ca4082131715a85e1cd78656.tar.gz
webtools.sourceediting-1511503b60fb8900ca4082131715a85e1cd78656.tar.xz
webtools.sourceediting-1511503b60fb8900ca4082131715a85e1cd78656.zip
[Bug 484762] Add JSON Editor contribution into maven build and include into features
JSON Editor feature is included into the main feature JSON Core and UI features are fixed Signed-off-by: Victor Rubezhny <vrubezhny@exadel.com>
Diffstat (limited to 'features')
-rw-r--r--features/org.eclipse.wst.json_core.feature/pom.xml5
-rw-r--r--features/org.eclipse.wst.json_ui.feature/pom.xml5
-rw-r--r--features/org.eclipse.wst.web_core.feature/feature.xml4
-rw-r--r--features/org.eclipse.wst.web_sdk.feature/feature.xml3
-rw-r--r--features/org.eclipse.wst.web_ui.feature/feature.xml4
5 files changed, 11 insertions, 10 deletions
diff --git a/features/org.eclipse.wst.json_core.feature/pom.xml b/features/org.eclipse.wst.json_core.feature/pom.xml
index 50ca87d37..d17ecc73e 100644
--- a/features/org.eclipse.wst.json_core.feature/pom.xml
+++ b/features/org.eclipse.wst.json_core.feature/pom.xml
@@ -30,11 +30,6 @@
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<version>${tycho-extras.version}</version>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-source-feature-plugin</artifactId>
- <version>${tycho-extras.version}</version>
<executions>
<execution>
<id>source-feature</id>
diff --git a/features/org.eclipse.wst.json_ui.feature/pom.xml b/features/org.eclipse.wst.json_ui.feature/pom.xml
index 6f5e76a8d..7f7202e69 100644
--- a/features/org.eclipse.wst.json_ui.feature/pom.xml
+++ b/features/org.eclipse.wst.json_ui.feature/pom.xml
@@ -30,11 +30,6 @@
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<version>${tycho-extras.version}</version>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-source-feature-plugin</artifactId>
- <version>${tycho-extras.version}</version>
<executions>
<execution>
<id>source-feature</id>
diff --git a/features/org.eclipse.wst.web_core.feature/feature.xml b/features/org.eclipse.wst.web_core.feature/feature.xml
index 804865a49..e7f62a22e 100644
--- a/features/org.eclipse.wst.web_core.feature/feature.xml
+++ b/features/org.eclipse.wst.web_core.feature/feature.xml
@@ -34,6 +34,10 @@
<includes
id="org.eclipse.wst.server_core.feature"
version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.wst.json_core.feature"
+ version="0.0.0"/>
<plugin
id="org.eclipse.wst.css.core"
diff --git a/features/org.eclipse.wst.web_sdk.feature/feature.xml b/features/org.eclipse.wst.web_sdk.feature/feature.xml
index 4f8ae51f9..87990d61d 100644
--- a/features/org.eclipse.wst.web_sdk.feature/feature.xml
+++ b/features/org.eclipse.wst.web_sdk.feature/feature.xml
@@ -39,4 +39,7 @@
id="org.eclipse.wst.server_sdk.feature"
version="0.0.0"/>
+ <includes
+ id="org.eclipse.wst.json_sdk.feature"
+ version="0.0.0"/>
</feature>
diff --git a/features/org.eclipse.wst.web_ui.feature/feature.xml b/features/org.eclipse.wst.web_ui.feature/feature.xml
index 950802ee3..3aef03038 100644
--- a/features/org.eclipse.wst.web_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.web_ui.feature/feature.xml
@@ -43,6 +43,10 @@
<includes
id="org.eclipse.wst.xml_ui.feature"
version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.wst.json_ui.feature"
+ version="0.0.0"/>
<plugin
id="org.eclipse.wst.jsdt.web.core"

Back to the top