Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorMat Booth2018-07-13 09:12:17 -0400
committerMat Booth2018-07-13 09:17:57 -0400
commitf2d081cc362fccde148fbd5bfc05b61728289e8b (patch)
treefaf49f789c01a6cf569c2852ceb5a61975be4ceb /releng
parent2fa5b87e1f0764f9abb081904ecba5b340c25893 (diff)
downloadorg.eclipse.ecf-f2d081cc362fccde148fbd5bfc05b61728289e8b.tar.gz
org.eclipse.ecf-f2d081cc362fccde148fbd5bfc05b61728289e8b.tar.xz
org.eclipse.ecf-f2d081cc362fccde148fbd5bfc05b61728289e8b.zip
Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=534087
Backport console bundle metadata changes from osgir7 branch Allow building/running against Oxygen or Photon by keeping the require-bundle, but making it optional, so it may be fulfilled by either the old-style felix-gogo bundle from Oxygen or any bundle that supplies the felix.service.command package like the new-style felix-gogo bundle from Photon. Change-Id: I438c815319c2156c689b1ac90f211258e2bb9e5c Signed-off-by: Mat Booth <mat.booth@redhat.com>
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.ecf.releng.target/ecf-oxygen.target18
-rw-r--r--releng/org.eclipse.ecf.releng.target/ecf-photon.target12
2 files changed, 13 insertions, 17 deletions
diff --git a/releng/org.eclipse.ecf.releng.target/ecf-oxygen.target b/releng/org.eclipse.ecf.releng.target/ecf-oxygen.target
index 736068e46..7ff022ed1 100644
--- a/releng/org.eclipse.ecf.releng.target/ecf-oxygen.target
+++ b/releng/org.eclipse.ecf.releng.target/ecf-oxygen.target
@@ -1,24 +1,18 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Oxygen" sequenceNumber="20">
+<?pde version="3.8"?><target name="Oxygen" sequenceNumber="22">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
<repository location="http://download.eclipse.org/cbi/updates/license/1.0.1.v20140414-1359"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
-<unit id="com.sun.syndication.source" version="0.9.0.v200803061811"/>
<unit id="org.apache.hadoop.zookeeper" version="3.3.3.v201105210832"/>
<unit id="org.apache.hadoop.zookeeper.source" version="3.3.3.v201105210832"/>
-<unit id="org.apache.ws.commons.util" version="1.0.1.v20100518-1140"/>
-<unit id="org.apache.xmlrpc" version="3.0.0.v20100427-1100"/>
-<unit id="org.jdom" version="1.1.1.v201101151400"/>
-<unit id="org.jdom.source" version="1.1.1.v201101151400"/>
-<unit id="org.xbill.dns" version="2.0.8.v201112050911"/>
-<unit id="org.xbill.dns.source" version="2.0.8.v201112050911"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
+<unit id="com.sun.syndication.source" version="0.9.0.v200803061811"/>
<unit id="org.apache.commons.codec" version="1.9.0.v20170208-1614"/>
<unit id="org.apache.commons.codec.source" version="1.9.0.v20170208-1614"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170210-0925"/>
@@ -28,7 +22,11 @@
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.json" version="1.0.0.v201011060100"/>
-<repository location="http://download.eclipse.org/tools/orbit/R-builds/R20170307180635/repository"/>
+<unit id="org.jdom" version="1.1.1.v201101151400"/>
+<unit id="org.jdom.source" version="1.1.1.v201101151400"/>
+<unit id="org.xbill.dns" version="2.0.8.v201112050911"/>
+<unit id="org.xbill.dns.source" version="2.0.8.v201112050911"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180330011457/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.edit.ui.feature.group" version="2.13.0.v20170609-0928"/>
diff --git a/releng/org.eclipse.ecf.releng.target/ecf-photon.target b/releng/org.eclipse.ecf.releng.target/ecf-photon.target
index 22c368a22..78bf89f13 100644
--- a/releng/org.eclipse.ecf.releng.target/ecf-photon.target
+++ b/releng/org.eclipse.ecf.releng.target/ecf-photon.target
@@ -1,22 +1,18 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Photon" sequenceNumber="23">
+<?pde version="3.8"?><target name="Photon" sequenceNumber="25">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
<repository location="http://download.eclipse.org/cbi/updates/license/1.0.1.v20140414-1359"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
-<unit id="com.sun.syndication.source" version="0.9.0.v200803061811"/>
<unit id="org.apache.hadoop.zookeeper" version="3.3.3.v201105210832"/>
<unit id="org.apache.hadoop.zookeeper.source" version="3.3.3.v201105210832"/>
-<unit id="org.apache.ws.commons.util" version="1.0.1.v20100518-1140"/>
-<unit id="org.apache.xmlrpc" version="3.0.0.v20100427-1100"/>
-<unit id="org.xbill.dns" version="2.0.8.v201112050911"/>
-<unit id="org.xbill.dns.source" version="2.0.8.v201112050911"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
+<unit id="com.sun.syndication.source" version="0.9.0.v200803061811"/>
<unit id="org.apache.commons.codec" version="1.10.0.v20180409-1845"/>
<unit id="org.apache.commons.codec.source" version="1.10.0.v20180409-1845"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
@@ -30,6 +26,8 @@
<unit id="org.jdom" version="1.1.1.v201101151400"/>
<unit id="org.jdom.source" version="1.1.1.v201101151400"/>
<unit id="org.json" version="1.0.0.v201011060100"/>
+<unit id="org.xbill.dns" version="2.0.8.v201112050911"/>
+<unit id="org.xbill.dns.source" version="2.0.8.v201112050911"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">

Back to the top