Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Homer2020-06-01 05:42:23 +0000
committerTony Homer2020-06-01 20:01:54 +0000
commit0563a98c6e08122671a49dfc0a81fe518232abc5 (patch)
tree1b5b0da0bf335668b25ba23fe604f259f64f91f7
parent3997ba62f5259f582b8cfdbce130527bd8935c87 (diff)
downloadorg.eclipse.cdt-0563a98c6e08122671a49dfc0a81fe518232abc5.tar.gz
org.eclipse.cdt-0563a98c6e08122671a49dfc0a81fe518232abc5.tar.xz
org.eclipse.cdt-0563a98c6e08122671a49dfc0a81fe518232abc5.zip
Bug 558284 - re-enable docker plug-in
Reverts commit d70af1889702ce8621d5c8dc135fe7a3c666f20b. The API change was reverted See https://git.eclipse.org/r/#/c/163943/ Change-Id: If8049308e8f2aec3a1930433af9c6348d641b0ab Signed-off-by: Tony Homer <tony.homer@intel.com>
-rw-r--r--pom.xml4
-rw-r--r--releng/org.eclipse.cdt.repo/category.xml4
-rw-r--r--releng/org.eclipse.cdt.target/cdt.target2
3 files changed, 5 insertions, 5 deletions
diff --git a/pom.xml b/pom.xml
index 68c94610cce..a243ccdee7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -192,8 +192,8 @@
<module>jtag/org.eclipse.cdt.debug.gdbjtag-feature</module>
<module>launch/org.eclipse.cdt.launch</module>
- <!-- <module>launch/org.eclipse.cdt.docker.launcher</module>
- <module>launch/org.eclipse.cdt.docker.launcher-feature</module> -->
+ <module>launch/org.eclipse.cdt.docker.launcher</module>
+ <module>launch/org.eclipse.cdt.docker.launcher-feature</module>
<module>llvm/org.eclipse.cdt.managedbuilder.llvm.ui</module>
<module>llvm/org.eclipse.cdt.managedbuilder.llvm-feature</module>
diff --git a/releng/org.eclipse.cdt.repo/category.xml b/releng/org.eclipse.cdt.repo/category.xml
index c29804a88d5..5e066e8b285 100644
--- a/releng/org.eclipse.cdt.repo/category.xml
+++ b/releng/org.eclipse.cdt.repo/category.xml
@@ -66,12 +66,12 @@
<feature url="features/org.eclipse.cdt.meson.source_0.0.0.qualifier.jar" id="org.eclipse.cdt.meson.source" version="0.0.0">
<category name="extra"/>
</feature>
- <!-- <feature url="features/org.eclipse.cdt.docker.launcher_0.0.0.qualifier.jar" id="org.eclipse.cdt.docker.launcher" version="0.0.0">
+ <feature url="features/org.eclipse.cdt.docker.launcher_0.0.0.qualifier.jar" id="org.eclipse.cdt.docker.launcher" version="0.0.0">
<category name="extra"/>
</feature>
<feature url="features/org.eclipse.cdt.docker.launcher.source_0.0.0.qualifier.jar" id="org.eclipse.cdt.docker.launcher.source" version="0.0.0">
<category name="extra"/>
- </feature> -->
+ </feature>
<feature url="features/org.eclipse.cdt.testsrunner.feature_0.0.0.qualifier.jar" id="org.eclipse.cdt.testsrunner.feature" version="0.0.0">
<category name="extra"/>
</feature>
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index 015b316ed1b..9ed7fbed125 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
-<target name="cdt" sequenceNumber="82">
+<target name="cdt" sequenceNumber="81">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>

Back to the top