Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Xenos2016-03-22 17:33:14 +0000
committerStefan Xenos2016-03-22 21:52:18 +0000
commitbd0ead98b29653875145033cf77d61e14c636b02 (patch)
treec5bf10618a50078c31229d396f53185268ca1ecf /examples/org.eclipse.compare.examples
parentb8821710ffb03f8e7573be209e1ab14e27ba04b4 (diff)
downloadeclipse.platform.team-bd0ead98b29653875145033cf77d61e14c636b02.tar.gz
eclipse.platform.team-bd0ead98b29653875145033cf77d61e14c636b02.tar.xz
eclipse.platform.team-bd0ead98b29653875145033cf77d61e14c636b02.zip
Bug 489805 - Move the team git repository to Java 1.8
Fixes compiler warnings. This reverts commit b8821710ffb03f8e7573be209e1ab14e27ba04b4. Change-Id: I64b54428dc8500ab05427d505bb801e46511916b Signed-off-by: Stefan Xenos <sxenos@gmail.com>
Diffstat (limited to 'examples/org.eclipse.compare.examples')
-rw-r--r--examples/org.eclipse.compare.examples/.classpath2
-rw-r--r--examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF4
-rw-r--r--examples/org.eclipse.compare.examples/pom.xml14
3 files changed, 4 insertions, 16 deletions
diff --git a/examples/org.eclipse.compare.examples/.classpath b/examples/org.eclipse.compare.examples/.classpath
index b7464f3ca..01836c484 100644
--- a/examples/org.eclipse.compare.examples/.classpath
+++ b/examples/org.eclipse.compare.examples/.classpath
@@ -2,6 +2,6 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF
index 7a374027e..d9d2edb74 100644
--- a/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.compare.examples; singleton:=true
-Bundle-Version: 3.1.500.qualifier
+Bundle-Version: 3.2.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.compare.examples.structurecreator
@@ -12,4 +12,4 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.jface.text,
org.eclipse.core.runtime
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/examples/org.eclipse.compare.examples/pom.xml b/examples/org.eclipse.compare.examples/pom.xml
index 70b620955..3f899ae06 100644
--- a/examples/org.eclipse.compare.examples/pom.xml
+++ b/examples/org.eclipse.compare.examples/pom.xml
@@ -19,18 +19,6 @@
</parent>
<groupId>org.eclipse.compare</groupId>
<artifactId>org.eclipse.compare.examples</artifactId>
- <version>3.1.500-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <!-- observed Juno compile target -->
- <executionEnvironment>J2SE-1.4</executionEnvironment>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>

Back to the top