diff options
author | Tom Schindl | 2015-03-20 21:43:52 +0000 |
---|---|---|
committer | Tom Schindl | 2015-03-20 21:43:52 +0000 |
commit | 08e4de54d81b20499b62be93ff1c4415bd1b21c9 (patch) | |
tree | 124e5cf834bc310538e2636e0341096097438cfa | |
parent | 5c94aeb402ca9badd3d0e2e9bfb8fa47f516749f (diff) | |
download | org.eclipse.efxclipse-08e4de54d81b20499b62be93ff1c4415bd1b21c9.tar.gz org.eclipse.efxclipse-08e4de54d81b20499b62be93ff1c4415bd1b21c9.tar.xz org.eclipse.efxclipse-08e4de54d81b20499b62be93ff1c4415bd1b21c9.zip |
Bug 462726 - Ship a javax.annotation replacement who delegates to the
JRE
4 files changed, 17 insertions, 15 deletions
diff --git a/bundles/runtime/javax.annotation.jre/META-INF/MANIFEST.MF b/bundles/runtime/javax.annotation.jre/META-INF/MANIFEST.MF index 44e98bf20..c17aa2027 100644 --- a/bundles/runtime/javax.annotation.jre/META-INF/MANIFEST.MF +++ b/bundles/runtime/javax.annotation.jre/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Jre +Bundle-Name: Javax Annotation Bundle for JRE Bundle-SymbolicName: javax.annotation.jre Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/releng/org.eclipse.fx.releng/pom.xml b/releng/org.eclipse.fx.releng/pom.xml index 33d3044b8..85787d6ac 100755 --- a/releng/org.eclipse.fx.releng/pom.xml +++ b/releng/org.eclipse.fx.releng/pom.xml @@ -67,6 +67,8 @@ <!-- Format Conversion --> <module>../../bundles/runtime/org.eclipse.fx.formats.svg</module> + + <module>../../bundles/runtime/javax.annotation.jre</module> <!-- Features --> <module>../runtime/org.eclipse.fx.core.feature</module> diff --git a/releng/runtime/org.eclipse.fx.runtime.e4fx.feature/feature.xml b/releng/runtime/org.eclipse.fx.runtime.e4fx.feature/feature.xml index 4f494d08a..abdcc6c81 100644 --- a/releng/runtime/org.eclipse.fx.runtime.e4fx.feature/feature.xml +++ b/releng/runtime/org.eclipse.fx.runtime.e4fx.feature/feature.xml @@ -212,13 +212,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U unpack="false"/> <plugin - id="javax.annotation" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="javax.inject" download-size="0" install-size="0" @@ -555,4 +548,11 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U version="0.0.0" unpack="false"/> + <plugin + id="javax.annotation.jre" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature> diff --git a/releng/runtime/org.eclipse.fx.target.feature/feature.xml b/releng/runtime/org.eclipse.fx.target.feature/feature.xml index 26a54485b..33ad4ca2b 100644 --- a/releng/runtime/org.eclipse.fx.target.feature/feature.xml +++ b/releng/runtime/org.eclipse.fx.target.feature/feature.xml @@ -1339,13 +1339,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U unpack="false"/> <plugin - id="javax.annotation" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="javax.el" download-size="0" install-size="0" @@ -2286,4 +2279,11 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U version="0.0.0" unpack="false"/> + <plugin + id="javax.annotation.jre" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature> |