removing category from updatesite and fixing build properties
diff --git a/features/org.eclipse.epsilon.emc.html.dt.feature/build.properties b/features/org.eclipse.epsilon.emc.html.dt.feature/build.properties
index 64f93a9..4aa5687 100644
--- a/features/org.eclipse.epsilon.emc.html.dt.feature/build.properties
+++ b/features/org.eclipse.epsilon.emc.html.dt.feature/build.properties
@@ -1 +1,3 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+ EPL-2.0.html,\
+ about.html
diff --git a/features/org.eclipse.epsilon.emc.html.dt.feature/feature.xml b/features/org.eclipse.epsilon.emc.html.dt.feature/feature.xml
index 56814f9..7903e0f 100644
--- a/features/org.eclipse.epsilon.emc.html.dt.feature/feature.xml
+++ b/features/org.eclipse.epsilon.emc.html.dt.feature/feature.xml
@@ -11,19 +11,20 @@
[Enter Feature Description here.]
</description>
- <copyright>
+ <copyright>
Copyright (c) 2018 The University of York.
This program and the accompanying materials are made
available under the terms of the Eclipse Public License 2.0
which is available at https://www.eclipse.org/legal/epl-2.0
</copyright>
- <url>
- <discovery label="EMF Releases" url="https://download.eclipse.org/modeling/emf/emf/builds/release"/>
- </url>
+ <includes
+ id="org.eclipse.epsilon.emc.html.feature"
+ version="2.3.0.qualifier"/>
- <includes id="org.eclipse.epsilon.emc.html.feature" version="2.3.0.qualifier"/>
- <includes id="org.eclipse.epsilon.core.dt.feature" version="2.3.0.qualifier"/>
+ <includes
+ id="org.eclipse.epsilon.core.dt.feature"
+ version="2.3.0.qualifier"/>
<plugin
id="org.eclipse.epsilon.emc.html.dt"
diff --git a/features/org.eclipse.epsilon.emc.html.feature/build.properties b/features/org.eclipse.epsilon.emc.html.feature/build.properties
index 64f93a9..4aa5687 100644
--- a/features/org.eclipse.epsilon.emc.html.feature/build.properties
+++ b/features/org.eclipse.epsilon.emc.html.feature/build.properties
@@ -1 +1,3 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+ EPL-2.0.html,\
+ about.html
diff --git a/features/org.eclipse.epsilon.emc.html.feature/feature.xml b/features/org.eclipse.epsilon.emc.html.feature/feature.xml
index 2d1cf9d..594aa05 100644
--- a/features/org.eclipse.epsilon.emc.html.feature/feature.xml
+++ b/features/org.eclipse.epsilon.emc.html.feature/feature.xml
@@ -11,18 +11,22 @@
[Enter Feature Description here.]
</description>
- <copyright>
+ <copyright>
Copyright (c) 2018 The University of York.
This program and the accompanying materials are made
available under the terms of the Eclipse Public License 2.0
which is available at https://www.eclipse.org/legal/epl-2.0
</copyright>
- <url>
- <discovery label="EMF Releases" url="https://download.eclipse.org/modeling/emf/emf/builds/release"/>
- </url>
+ <includes
+ id="org.eclipse.epsilon.core.feature"
+ version="2.3.0.qualifier"/>
- <includes id="org.eclipse.epsilon.core.feature" version="2.3.0.qualifier"/>
+ <requires>
+ <import plugin="org.eclipse.epsilon.eol.engine"/>
+ <import plugin="org.eclipse.epsilon.emc.plainxml"/>
+ <import plugin="org.jsoup" version="1.7.2" match="greaterOrEqual"/>
+ </requires>
<plugin
id="org.eclipse.epsilon.emc.html"
diff --git a/plugins/org.eclipse.epsilon.emc.html.dt/build.properties b/plugins/org.eclipse.epsilon.emc.html.dt/build.properties
index ffacdd5..61a227a 100644
--- a/plugins/org.eclipse.epsilon.emc.html.dt/build.properties
+++ b/plugins/org.eclipse.epsilon.emc.html.dt/build.properties
@@ -4,4 +4,6 @@
.,\
plugin.xml,\
images/,\
- src/
+ src/,\
+ EPL-2.0.html,\
+ about.html
diff --git a/plugins/org.eclipse.epsilon.emc.html/build.properties b/plugins/org.eclipse.epsilon.emc.html/build.properties
index 34d2e4d..82a59dd 100644
--- a/plugins/org.eclipse.epsilon.emc.html/build.properties
+++ b/plugins/org.eclipse.epsilon.emc.html/build.properties
@@ -1,4 +1,6 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .
+ .,\
+ EPL-2.0.html,\
+ about.html
diff --git a/releng/org.eclipse.epsilon.updatesite/category.xml b/releng/org.eclipse.epsilon.updatesite/category.xml
index 912d816..4b6f2cf 100644
--- a/releng/org.eclipse.epsilon.updatesite/category.xml
+++ b/releng/org.eclipse.epsilon.updatesite/category.xml
@@ -81,12 +81,6 @@
<feature id="org.eclipse.epsilon.emc.csv.feature">
<category name="Epsilon Spreadsheet Integration"/>
</feature>
- <feature url="features/org.eclipse.epsilon.emc.html.dt.feature_2.3.0.qualifier.jar" id="org.eclipse.epsilon.emc.html.dt.feature" version="2.3.0.qualifier">
- <category name="Epsilon HTML Integration"/>
- </feature>
- <feature url="features/org.eclipse.epsilon.emc.html.feature_2.3.0.qualifier.jar" id="org.eclipse.epsilon.emc.html.feature" version="2.3.0.qualifier">
- <category name="Epsilon HTML Integration"/>
- </feature>
<category-def name="Epsilon Core" label="Epsilon Core">
<description>
Parsers, execution engines, development tools (editors, launch configurations, debuggers etc.) for languages of the Epsilon platform.
@@ -127,11 +121,6 @@
Support for managing spreadsheet models with languages of the Epsilon platform.
</description>
</category-def>
- <category-def name="Epsilon HTML Integration" label="Epsilon HTML Integration">
- <description>
- Eclipse plugins that extend Epsilon's Model Connectivity (EMC) layer with support for managing HTML documents using languages of the Epsilon platform to perform activities such as code generation, HTML validation and transformation.
- </description>
- </category-def>
<repository-reference location="http://download.eclipse.org/emfatic/update" enabled="true" />
<repository-reference location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases" enabled="true" />
<repository-reference location="http://download.eclipse.org/releases/2020-09" enabled="true" />
