diff options
| author | Victor Rubezhny | 2016-01-22 18:20:50 +0000 |
|---|---|---|
| committer | Victor Rubezhny | 2016-01-22 19:36:43 +0000 |
| commit | 1511503b60fb8900ca4082131715a85e1cd78656 (patch) | |
| tree | f67b45403e3bef19d5db84e525a0b5c718257363 | |
| parent | 9a3942136d222e5249d788e09c3ed73c31d5aaed (diff) | |
| download | webtools.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>
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 50ca87d37b..d17ecc73e0 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 6f5e76a8d2..7f7202e693 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 804865a49a..e7f62a22e4 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 4f8ae51f9a..87990d61d9 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 950802ee3f..3aef030382 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" |