diff options
| author | Thomas Watson | 2016-09-29 14:22:07 +0000 |
|---|---|---|
| committer | Thomas Watson | 2016-09-29 14:49:20 +0000 |
| commit | 85800e30f490fa2a0f9888b93a83861b70d8973d (patch) | |
| tree | f0a31328c7a0ff97e70a7c7d45614b1238bdcaaa /bundles/org.eclipse.equinox.weaving.hook | |
| parent | 44d5102c882b80772a85adec0ca3effe7da5dc52 (diff) | |
| download | rt.equinox.bundles-85800e30f490fa2a0f9888b93a83861b70d8973d.tar.gz rt.equinox.bundles-85800e30f490fa2a0f9888b93a83861b70d8973d.tar.xz rt.equinox.bundles-85800e30f490fa2a0f9888b93a83861b70d8973d.zip | |
Bug 502425 - Move Equinox Framework up to Java 7
Change-Id: Ib8a743f81fc1708be0f6ec1615fb1d5cf7e4285a
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
Diffstat (limited to 'bundles/org.eclipse.equinox.weaving.hook')
4 files changed, 7 insertions, 7 deletions
diff --git a/bundles/org.eclipse.equinox.weaving.hook/.classpath b/bundles/org.eclipse.equinox.weaving.hook/.classpath index 33db7eff5..e627117f2 100644 --- a/bundles/org.eclipse.equinox.weaving.hook/.classpath +++ b/bundles/org.eclipse.equinox.weaving.hook/.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 excluding="org/aspectj/weaver/osgi/hooks/AspectJBundleWatcherHook.java|org/aspectj/weaver/osgi/hooks/AspectJBundleFileWrapperFactoryHook.java|org/aspectj/weaver/osgi/hooks/AspectJHookConfigurator.java|org/aspectj/weaver/osgi/hooks/AspectJClassLoadingHook.java|org/aspectj/weaver/osgi/hooks/AspectJClassLoadingStatsHook.java|org/aspectj/osgi/hooks/AspectJHookConfigurator.java|org/aspectj/osgi/hooks/AspectJClassLoadingHook.java|org/aspectj/osgi/hooks/AspectJBundleFileWrapperFactoryHook.java|org/aspectj/osgi/hooks/AspectJBundleWatcherHook.java|org/aspectj/osgi/hooks/AspectJClassLoadingStatsHook.java" kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/bundles/org.eclipse.equinox.weaving.hook/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.weaving.hook/.settings/org.eclipse.jdt.core.prefs index 5c6b0177e..40b0c8b3a 100644 --- a/bundles/org.eclipse.equinox.weaving.hook/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.equinox.weaving.hook/.settings/org.eclipse.jdt.core.prefs @@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled 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 @@ -109,7 +109,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore 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.weaving.hook/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.weaving.hook/META-INF/MANIFEST.MF index 3ebc84584..30c902d4b 100644 --- a/bundles/org.eclipse.equinox.weaving.hook/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.weaving.hook/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Aspect Weaving Hooks Plug-in Bundle-SymbolicName: org.eclipse.equinox.weaving.hook -Bundle-Version: 1.1.200.qualifier +Bundle-Version: 1.2.0.qualifier Fragment-Host: org.eclipse.osgi;bundle-version="[3.10.0,4.0.0)" Bundle-Vendor: Eclipse.org - Equinox Export-Package: org.eclipse.equinox.service.weaving, org.eclipse.equinox.weaving.adaptors;x-friends:="org.eclipse.equinox.weaving.tests", org.eclipse.equinox.weaving.hooks;x-friends:="org.eclipse.equinox.weaving.tests" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/bundles/org.eclipse.equinox.weaving.hook/pom.xml b/bundles/org.eclipse.equinox.weaving.hook/pom.xml index 0fc3e4d5a..8a5b2a44c 100644 --- a/bundles/org.eclipse.equinox.weaving.hook/pom.xml +++ b/bundles/org.eclipse.equinox.weaving.hook/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.weaving.hook</artifactId> - <version>1.1.200-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> |