Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2013-05-16 10:57:31 -0400
committerThomas Watson2013-05-16 11:06:47 -0400
commit110427680d45bc0bba3f818b77b2f92a96ad7fb7 (patch)
treecd195c692e24fd14d8593bc526667e0703548d00 /bundles
parenta2d99f60d2a4ab0c8ac6f42f6d816f59fbcc18ef (diff)
downloadrt.equinox.framework-110427680d45bc0bba3f818b77b2f92a96ad7fb7.tar.gz
rt.equinox.framework-110427680d45bc0bba3f818b77b2f92a96ad7fb7.tar.xz
rt.equinox.framework-110427680d45bc0bba3f818b77b2f92a96ad7fb7.zip
Add compatibility.state fragment to parent pom and fix build break for execution environment of the system bundle
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.osgi/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.osgi/pom.xml14
2 files changed, 15 insertions, 1 deletions
diff --git a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
index 2187bfc34..842680b7f 100644
--- a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
@@ -80,5 +80,5 @@ Bundle-DocUrl: http://www.eclipse.org
Eclipse-ExtensibleAPI: true
Eclipse-SystemBundle: true
Main-Class: org.eclipse.core.runtime.adaptor.EclipseStarter
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6, J2SE-1.5
Eclipse-BundleShape: jar
diff --git a/bundles/org.eclipse.osgi/pom.xml b/bundles/org.eclipse.osgi/pom.xml
index 2d059bb55..a297a0120 100644
--- a/bundles/org.eclipse.osgi/pom.xml
+++ b/bundles/org.eclipse.osgi/pom.xml
@@ -21,4 +21,18 @@
<artifactId>org.eclipse.osgi</artifactId>
<version>3.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <executionEnvironment>JavaSE-1.6</executionEnvironment>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
+

Back to the top