Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornickboldt2018-03-20 10:04:04 -0400
committernickboldt2018-03-20 10:04:04 -0400
commit2b9cf062885ea950efbbef0b5c1d93f733beb04e (patch)
treee1e5ae59bc497a5154dd73cc47fe653f0b89ef60 /packages
parent3679d122d9f53daac2def04674ac75c634193057 (diff)
downloadorg.eclipse.epp.packages-2b9cf062885ea950efbbef0b5c1d93f733beb04e.tar.gz
org.eclipse.epp.packages-2b9cf062885ea950efbbef0b5c1d93f733beb04e.tar.xz
org.eclipse.epp.packages-2b9cf062885ea950efbbef0b5c1d93f733beb04e.zip
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 (same commit, but this time the upstream simrel repo has been rebuilt already)
Change-Id: I83b857342be604269e59277e621df24192c75af0 Signed-off-by: nickboldt <nboldt@redhat.com>
Diffstat (limited to 'packages')
-rw-r--r--packages/org.eclipse.epp.package.jee.product/epp.product5
-rw-r--r--packages/org.eclipse.epp.package.reporting.product/epp.product5
2 files changed, 4 insertions, 6 deletions
diff --git a/packages/org.eclipse.epp.package.jee.product/epp.product b/packages/org.eclipse.epp.package.jee.product/epp.product
index 3cfd8caf..cc2819a3 100644
--- a/packages/org.eclipse.epp.package.jee.product/epp.product
+++ b/packages/org.eclipse.epp.package.jee.product/epp.product
@@ -218,9 +218,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
<feature id="org.eclipse.jpt.common.eclipselink.feature" installMode="root"/>
<feature id="org.eclipse.jpt.common.feature" installMode="root"/>
- <!-- temporarily removed: org.eclipse.persistence.moxy 2.6.0.v20140809-296a69f requires package com.sun.codemodel -->
- <!-- <feature id="org.eclipse.jpt.dbws.eclipselink.feature" installMode="root"/> -->
- <!-- <feature id="org.eclipse.jpt.jaxb.eclipselink.feature" installMode="root"/> -->
+ <feature id="org.eclipse.jpt.dbws.eclipselink.feature" installMode="root"/>
+ <feature id="org.eclipse.jpt.jaxb.eclipselink.feature" installMode="root"/>
<feature id="org.eclipse.jpt.jaxb.feature" installMode="root"/>
<feature id="org.eclipse.jpt.jpa.eclipselink.feature" installMode="root"/>
<feature id="org.eclipse.jpt.jpa.feature" installMode="root"/>
diff --git a/packages/org.eclipse.epp.package.reporting.product/epp.product b/packages/org.eclipse.epp.package.reporting.product/epp.product
index 145e362e..04a20fd5 100644
--- a/packages/org.eclipse.epp.package.reporting.product/epp.product
+++ b/packages/org.eclipse.epp.package.reporting.product/epp.product
@@ -212,9 +212,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
<feature id="org.eclipse.jdt" installMode="root"/>
<feature id="org.eclipse.jpt.common.eclipselink.feature" installMode="root"/>
<feature id="org.eclipse.jpt.common.feature" installMode="root"/>
- <!-- temporarily removed: org.eclipse.persistence.moxy 2.6.0.v20140809-296a69f requires package com.sun.codemodel -->
- <!-- <feature id="org.eclipse.jpt.dbws.eclipselink.feature" installMode="root"/> -->
- <!-- <feature id="org.eclipse.jpt.jaxb.eclipselink.feature" installMode="root"/> -->
+ <feature id="org.eclipse.jpt.dbws.eclipselink.feature" installMode="root"/>
+ <feature id="org.eclipse.jpt.jaxb.eclipselink.feature" installMode="root"/>
<feature id="org.eclipse.jpt.jaxb.feature" installMode="root"/>
<feature id="org.eclipse.jpt.jpa.eclipselink.feature" installMode="root"/>
<feature id="org.eclipse.jpt.jpa.feature" installMode="root"/>

Back to the top