Bug 532235 - contribute WTP 3.10.0.20180319140501 for Photon M7; re-add org.eclipse.jpt.jaxb.eclipselink.feature and org.eclipse.jpt.dbws.eclipselink.feature
Change-Id: If7d228652ad34c579248005fe23b1cda69c6d7dc
Signed-off-by: nickboldt <nboldt@redhat.com>
diff --git a/simrel.aggr b/simrel.aggr
index 0212d76..4524d4c 100644
--- a/simrel.aggr
+++ b/simrel.aggr
@@ -483,9 +483,8 @@
<features href="webtools.aggrcon#//@repositories.0/@features.21"/>
<features href="webtools.aggrcon#//@repositories.0/@features.22"/>
<features href="webtools.aggrcon#//@repositories.0/@features.23"/>
- <!-- temporarily removed: org.eclipse.persistence.moxy 2.6.0.v20140809-296a69f requires package com.sun.codemodel -->
- <!-- <features href="webtools.aggrcon#//@repositories.0/@features.24"/> -->
- <!-- <features href="webtools.aggrcon#//@repositories.0/@features.25"/> -->
+ <features href="webtools.aggrcon#//@repositories.0/@features.24"/>
+ <features href="webtools.aggrcon#//@repositories.0/@features.25"/>
<features href="webtools.aggrcon#//@repositories.2/@features.0"/>
<features href="webtools.aggrcon#//@repositories.2/@features.1"/>
diff --git a/webtools.aggrcon b/webtools.aggrcon
index 3df3c71..8bf4f15 100644
--- a/webtools.aggrcon
+++ b/webtools.aggrcon
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/cbi/p2repo/2011/aggregator/1.1.0" label="WebTools">
- <repositories location="http://download.eclipse.org/webtools/downloads/drops/R3.10.0/S-3.10.0.M6-20180309052619/repository/" description="Web Tools 3.10.0.M6 repository">
+ <repositories location="http://download.eclipse.org/webtools/downloads/drops/R3.10.0/I-latest/repository/" description="Web Tools 3.10.0.M6 repository">
<features name="org.eclipse.wst.xml_ui.feature.feature.group">
<categories href="simrel.aggr#//@customCategories[identifier='Programming%20Languages']"/>
<categories href="simrel.aggr#//@customCategories[identifier='Web%2C%20XML%2C%20Java%20EE%20and%20OSGi%20Enterprise%20Development']"/>
@@ -77,13 +77,12 @@
<features name="org.eclipse.jst.ws.jaxws.dom.feature.feature.group">
<categories href="simrel.aggr#//@customCategories[identifier='Web%2C%20XML%2C%20Java%20EE%20and%20OSGi%20Enterprise%20Development']"/>
</features>
- <!-- temporarily removed: org.eclipse.persistence.moxy 2.6.0.v20140809-296a69f requires package com.sun.codemodel -->
- <!-- <features name="org.eclipse.jpt.jaxb.eclipselink.feature.feature.group">
+ <features name="org.eclipse.jpt.jaxb.eclipselink.feature.feature.group">
<categories href="simrel.aggr#//@customCategories[identifier='Web%2C%20XML%2C%20Java%20EE%20and%20OSGi%20Enterprise%20Development']"/>
- </features> -->
-<!-- <features name="org.eclipse.jpt.dbws.eclipselink.feature.feature.group">
+ </features>
+ <features name="org.eclipse.jpt.dbws.eclipselink.feature.feature.group">
<categories href="simrel.aggr#//@customCategories[identifier='Web%2C%20XML%2C%20Java%20EE%20and%20OSGi%20Enterprise%20Development']"/>
- </features> -->
+ </features>
</repositories>
<repositories location="http://download.eclipse.org/webtools/downloads/drops/C3.2.0/I-C3.2.0-20100614204142/repository/" description="Web Tools 3.2 capability site">
