Bug 569770 - Use versionized version of javax.annotations in
org.eclipse.e4.core.* bundles
Without this, you see the following errors if you start your IDE with
Java 15.
Description Resource Path Location Type
PostConstruct cannot be resolved to a
type MessageFactoryServiceImpl.java /org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services line
256 Java Problem
PreDestroy cannot be resolved to a
type BaseMessageRegistry.java /org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls line
353 Java Problem
The import javax.annotation.PostConstruct cannot be
resolved MessageFactoryServiceImpl.java /org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services line
32 Java Problem
The import javax.annotation.PreDestroy cannot be
resolved BaseMessageRegistry.java /org.eclipse.e4.core.services/src/org/eclipse/e4/core/services/nls line
24 Java Problem
The method isAnnotationPresent(Class<? extends Annotation>) in the type
AccessibleObject is not applicable for the arguments
(Class<PostConstruct>) MessageFactoryServiceImpl.java /org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services line
256 Java Problem
Change-Id: I05c69bb73fa498d3b6a919a8141a19606ae3b529
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
diff --git a/bundles/org.eclipse.e4.core.di.extensions.supplier/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.core.di.extensions.supplier/META-INF/MANIFEST.MF
index 7d3549e..05a5d2c 100644
--- a/bundles/org.eclipse.e4.core.di.extensions.supplier/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.core.di.extensions.supplier/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-SymbolicName: org.eclipse.e4.core.di.extensions.supplier
-Bundle-Version: 0.15.700.qualifier
+Bundle-Version: 0.15.800.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Capability: osgi.extender;
filter:="(&(osgi.extender=osgi.component)(version>=1.3)(!(version>=2.0)))"
@@ -17,7 +17,7 @@
org.osgi.service.component.annotations;version="1.3.0";resolution:=optional,
org.osgi.service.event;version="1.3.0",
org.osgi.service.log;version="1.3.0",
- javax.annotation
+ javax.annotation;version="1.3.5"
Service-Component: OSGI-INF/org.eclipse.e4.core.di.internal.extensions.OSGiObjectSupplier.xml,
OSGI-INF/org.eclipse.e4.core.di.internal.extensions.EventObjectSupplier.xml,
OSGI-INF/org.eclipse.e4.core.di.internal.extensions.PreferencesObjectSupplier.xml,
diff --git a/bundles/org.eclipse.e4.core.di.extensions.supplier/pom.xml b/bundles/org.eclipse.e4.core.di.extensions.supplier/pom.xml
index 57aafa1..bd41a3e 100644
--- a/bundles/org.eclipse.e4.core.di.extensions.supplier/pom.xml
+++ b/bundles/org.eclipse.e4.core.di.extensions.supplier/pom.xml
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.e4</groupId>
<artifactId>org.eclipse.e4.core.di.extensions.supplier</artifactId>
- <version>0.15.700-SNAPSHOT</version>
+ <version>0.15.800-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.e4.core.di/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.core.di/META-INF/MANIFEST.MF
index 86cee5a..30dad85 100644
--- a/bundles/org.eclipse.e4.core.di/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.core.di/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.e4.core.di
-Bundle-Version: 1.7.600.qualifier
+Bundle-Version: 1.7.700.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -13,7 +13,7 @@
org.eclipse.e4.core.internal.di.osgi;x-internal:=true,
org.eclipse.e4.core.internal.di.shared;x-friends:="org.eclipse.e4.core.contexts,org.eclipse.e4.core.di.extensions.supplier"
Require-Bundle: org.eclipse.e4.core.di.annotations;bundle-version="[1.4.0,2.0.0)";visibility:=reexport
-Import-Package: javax.annotation,
+Import-Package: javax.annotation;version="1.3.5",
javax.inject;version="1.0.0",
org.eclipse.osgi.framework.log;version="1.1.0",
org.osgi.framework;version="1.8.0",
diff --git a/bundles/org.eclipse.e4.core.di/pom.xml b/bundles/org.eclipse.e4.core.di/pom.xml
index 7008d26..e9ef719 100644
--- a/bundles/org.eclipse.e4.core.di/pom.xml
+++ b/bundles/org.eclipse.e4.core.di/pom.xml
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.e4</groupId>
<artifactId>org.eclipse.e4.core.di</artifactId>
- <version>1.7.600-SNAPSHOT</version>
+ <version>1.7.700-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF
index 1f42d93..3b3cdfd 100644
--- a/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@
Bundle-Version: 2.2.600.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: javax.annotation,
+Import-Package: javax.annotation;version="1.3.5",
javax.inject;version="1.0.0",
org.eclipse.osgi.service.debug;version="1.1.0",
org.eclipse.osgi.service.localization;version="1.1.0",
