Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Johnston2018-02-07 17:21:28 -0500
committerJeff Johnston2018-02-07 18:02:43 -0500
commit7c5719cde225ab39ad8ec469b35b88f1085ec35f (patch)
treea081e8c3fa8fe582db5b4d92dd5aaf2dce2f5af3
parentdff3af6bdfe83019d6a313996bdbf8af9160052a (diff)
downloadorg.eclipse.linuxtools-7c5719cde225ab39ad8ec469b35b88f1085ec35f.tar.gz
org.eclipse.linuxtools-7c5719cde225ab39ad8ec469b35b88f1085ec35f.tar.xz
org.eclipse.linuxtools-7c5719cde225ab39ad8ec469b35b88f1085ec35f.zip
Bug 530411 - Docker tools install JDT silently
- create new org.eclipse.linuxtools.jdt.docker.launcher.feature - make new feature include org.eclipse.linuxtools.jdt.docker.launcher plug-in and require org.eclipse.linuxtools.docker.feature - remove jdt plug-in from main docker feature - add new feature to containers/pom.xml Change-Id: Ia96173f71ce07be18257e09192066fb14b0ca11f Reviewed-on: https://git.eclipse.org/r/116889 Tested-by: Hudson CI Reviewed-by: Jeff Johnston <jjohnstn@redhat.com>
-rw-r--r--containers/org.eclipse.linuxtools.docker-feature/feature.xml7
-rw-r--r--containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/.project17
-rw-r--r--containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/build.properties3
-rw-r--r--containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/feature.properties25
-rw-r--r--containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/feature.xml37
-rw-r--r--containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/p2.inf3
-rw-r--r--containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/pom.xml57
-rw-r--r--containers/pom.xml1
8 files changed, 143 insertions, 7 deletions
diff --git a/containers/org.eclipse.linuxtools.docker-feature/feature.xml b/containers/org.eclipse.linuxtools.docker-feature/feature.xml
index 1f0400fe1f..41313be267 100644
--- a/containers/org.eclipse.linuxtools.docker-feature/feature.xml
+++ b/containers/org.eclipse.linuxtools.docker-feature/feature.xml
@@ -51,11 +51,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.eclipse.linuxtools.jdt.docker.launcher"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
diff --git a/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/.project b/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/.project
new file mode 100644
index 0000000000..88aa162f62
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.linuxtools.jdt.docker.launcher-feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/build.properties b/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/build.properties
new file mode 100644
index 0000000000..e4e8746dcf
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/build.properties
@@ -0,0 +1,3 @@
+bin.includes = feature.xml,\
+ p2.inf,\
+ feature.properties
diff --git a/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/feature.properties b/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/feature.properties
new file mode 100644
index 0000000000..da309dc65b
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/feature.properties
@@ -0,0 +1,25 @@
+###############################################################################
+# Copyright (c) 2018 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Red Hat - initial API and implementation
+###############################################################################
+
+# features.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=JDT Docker Launcher
+featureProvider=Eclipse Linux Tools
+description=Launch JDT executables in Docker Container
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=Copyright (c) 2018 Red Hat, Inc and others. All rights reserved.
+################ end of copyright property ####################################
+
diff --git a/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/feature.xml b/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/feature.xml
new file mode 100644
index 0000000000..851f4b088b
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/feature.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.linuxtools.jdt.docker.launcher.feature"
+ label="%featureName"
+ version="4.0.0.qualifier"
+ provider-name="%featureProvider"
+ license-feature="org.eclipse.license"
+ license-feature-version="0.0.0">
+
+ <description url="http://www.eclipse.org/linuxtools">
+ %featureDescription
+ </description>
+
+ <copyright url="http://www.redhat.com">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <url>
+ <update label="Linux Tools Docker Update Site" url="http://download.eclipse.org/linuxtools/update-docker"/>
+ </url>
+
+ <requires>
+ <import feature="org.eclipse.linuxtools.docker.feature" version="4.0.0" match="greaterOrEqual"/>
+ </requires>
+
+ <plugin
+ id="org.eclipse.linuxtools.jdt.docker.launcher"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/p2.inf b/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/p2.inf
new file mode 100644
index 0000000000..0cdd571f88
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/p2.inf
@@ -0,0 +1,3 @@
+instructions.configure=\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-docker-nightly,type:0,name:Linux Tools,enabled:false); \
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-docker-nightly,type:1,name:Linux Tools,enabled:false);
diff --git a/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/pom.xml b/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/pom.xml
new file mode 100644
index 0000000000..4719b5cc0a
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2014, 2015, Red Hat, Inc.
+
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+-->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.linuxtools</groupId>
+ <artifactId>org.eclipse.linuxtools.docker</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.linuxtools.jdt.docker.launcher.feature</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+ <name>Linux Tools JDT Docker Launch Feature</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>source-feature</id>
+ <phase>package</phase>
+ <goals>
+ <goal>source-feature</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <executions>
+ <execution>
+ <id>attached-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/containers/pom.xml b/containers/pom.xml
index 736cf40af2..53931ed1b7 100644
--- a/containers/pom.xml
+++ b/containers/pom.xml
@@ -34,6 +34,7 @@
<module>org.eclipse.linuxtools.docker.integration.tests</module>
<module>org.eclipse.linuxtools.docker.tests-feature</module>
<module>org.eclipse.linuxtools.jdt.docker.launcher</module>
+ <module>org.eclipse.linuxtools.jdt.docker.launcher-feature</module>
</modules>
<build>

Back to the top