Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bundles/org.eclipse.osgi/.gitignore4
-rw-r--r--bundles/org.eclipse.osgi/JavaSE-1.7.profile8
-rw-r--r--bundles/org.eclipse.osgi/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.osgi/supplement/.gitignore2
4 files changed, 8 insertions, 8 deletions
diff --git a/bundles/org.eclipse.osgi/.gitignore b/bundles/org.eclipse.osgi/.gitignore
index 7d67e02a9..324eb6720 100644
--- a/bundles/org.eclipse.osgi/.gitignore
+++ b/bundles/org.eclipse.osgi/.gitignore
@@ -5,6 +5,4 @@ console.jar
core.jar
defaultAdaptor.jar
eclipseAdaptor.jar
-resolver.jar
-/generated/
-.DS_Store
+resolver.jar \ No newline at end of file
diff --git a/bundles/org.eclipse.osgi/JavaSE-1.7.profile b/bundles/org.eclipse.osgi/JavaSE-1.7.profile
index 192b46e9f..92604f149 100644
--- a/bundles/org.eclipse.osgi/JavaSE-1.7.profile
+++ b/bundles/org.eclipse.osgi/JavaSE-1.7.profile
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2009, 2010 IBM Corporation and others.
+# Copyright (c) 2009, 2011 IBM Corporation and others.
# 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
@@ -190,9 +190,9 @@ org.osgi.framework.executionenvironment = \
JavaSE-1.6,\
JavaSE-1.7
osgi.java.profile.name = JavaSE-1.7
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
diff --git a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
index ea9d516ac..911d713a7 100644
--- a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
@@ -68,7 +68,7 @@ Bundle-Activator: org.eclipse.osgi.framework.internal.core.SystemBundleActivator
Bundle-Description: %systemBundle
Bundle-Copyright: %copyright
Bundle-Vendor: %eclipse.org
-Bundle-Version: 3.6.3.qualifier
+Bundle-Version: 3.6.50.qualifier
Bundle-Localization: systembundle
Bundle-DocUrl: http://www.eclipse.org
Eclipse-ExtensibleAPI: true
diff --git a/bundles/org.eclipse.osgi/supplement/.gitignore b/bundles/org.eclipse.osgi/supplement/.gitignore
new file mode 100644
index 000000000..07a846bd7
--- /dev/null
+++ b/bundles/org.eclipse.osgi/supplement/.gitignore
@@ -0,0 +1,2 @@
+/bin/
+.DS_Store

Back to the top