diff options
8 files changed, 15 insertions, 17 deletions
diff --git a/bundles/org.eclipse.equinox.region.tests/.classpath b/bundles/org.eclipse.equinox.region.tests/.classpath index 191db1d04..8a401d4f9 100644 --- a/bundles/org.eclipse.equinox.region.tests/.classpath +++ b/bundles/org.eclipse.equinox.region.tests/.classpath @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry exported="true" kind="lib" path="stubs/org.eclipse.virgo.teststubs.osgi.jar" sourcepath="stubs/org.eclipse.virgo.teststubs.osgi-sources.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" output="bundle_tests/PackageProvider1" path="bundles_src/PackageProvider1"/> @@ -16,5 +15,6 @@ <classpathentry kind="src" output="bundle_tests/CapabilityClient1" path="bundles_src/CapabilityClient1"/> <classpathentry kind="src" output="bundle_tests/Singleton1" path="bundles_src/Singleton1"/> <classpathentry kind="src" output="bundle_tests/Singleton2" path="bundles_src/Singleton2"/> + <classpathentry exported="true" kind="lib" path="stubs/org.eclipse.virgo.teststubs.osgi.jar" sourcepath="stubs/org.eclipse.virgo.teststubs.osgi-sources.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.equinox.region.tests/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.region.tests/.settings/org.eclipse.jdt.core.prefs index 67e8279ce..a5006af92 100644 --- a/bundles/org.eclipse.equinox.region.tests/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.equinox.region.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,3 @@ -#Thu Apr 07 11:36:51 CDT 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.builder.cleanOutputFolder=clean org.eclipse.jdt.core.builder.duplicateResourceTask=warning @@ -8,9 +7,9 @@ org.eclipse.jdt.core.circularClasspath=error org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled 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.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -95,7 +94,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.7 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/bundles/org.eclipse.equinox.region.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.region.tests/META-INF/MANIFEST.MF index 44fbdc38a..c54782a16 100644 --- a/bundles/org.eclipse.equinox.region.tests/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.region.tests/META-INF/MANIFEST.MF @@ -2,8 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Equinox Region Tests Bundle-SymbolicName: org.eclipse.equinox.region.tests -Bundle-Version: 1.0.100.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-Version: 1.4.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: junit.framework;version="4.8.1", org.aspectj.internal.lang.annotation;version="[1.6.3,2.0.0)";resolution:=optional, org.aspectj.lang;version="[1.6.3,2.0.0)";resolution:=optional, diff --git a/bundles/org.eclipse.equinox.region.tests/pom.xml b/bundles/org.eclipse.equinox.region.tests/pom.xml index 3115de52d..a7e4348f9 100644 --- a/bundles/org.eclipse.equinox.region.tests/pom.xml +++ b/bundles/org.eclipse.equinox.region.tests/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.region.tests</artifactId> - <version>1.0.100-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.region/.classpath b/bundles/org.eclipse.equinox.region/.classpath index ad32c83a7..098194ca4 100644 --- a/bundles/org.eclipse.equinox.region/.classpath +++ b/bundles/org.eclipse.equinox.region/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/bundles/org.eclipse.equinox.region/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.region/.settings/org.eclipse.jdt.core.prefs index 60fec9e81..e88e78ebc 100644 --- a/bundles/org.eclipse.equinox.region/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.equinox.region/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,3 @@ -#Fri Apr 08 08:55:56 CDT 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.builder.cleanOutputFolder=clean org.eclipse.jdt.core.builder.duplicateResourceTask=warning @@ -8,9 +7,9 @@ org.eclipse.jdt.core.circularClasspath=error org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled 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.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -71,7 +70,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=en org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.7 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/bundles/org.eclipse.equinox.region/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.region/META-INF/MANIFEST.MF index 222964e67..7662c6631 100644 --- a/bundles/org.eclipse.equinox.region/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.region/META-INF/MANIFEST.MF @@ -2,8 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.equinox.region -Bundle-Version: 1.3.100.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-Version: 1.4.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Fragment-Host: system.bundle ExtensionBundle-Activator: org.eclipse.equinox.internal.region.RegionManager Export-Package: org.eclipse.equinox.region;version="1.2.0" diff --git a/bundles/org.eclipse.equinox.region/pom.xml b/bundles/org.eclipse.equinox.region/pom.xml index 6a9a84def..1583f11c8 100644 --- a/bundles/org.eclipse.equinox.region/pom.xml +++ b/bundles/org.eclipse.equinox.region/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.region</artifactId> - <version>1.3.100-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> |