aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Sewe2012-10-18 06:56:14 (EDT)
committerAndreas Sewe2012-10-30 05:55:21 (EDT)
commit952971f5df3120b9a2bb8213f1d89670ca0a12e8 (patch)
tree4db6a21e3c2baebea7cc57be324ab04d9e8f888c
parentd54022c7184e757cc74c9c43353c0ebc531c3d93 (diff)
downloadorg.eclipse.recommenders-952971f5df3120b9a2bb8213f1d89670ca0a12e8.zip
org.eclipse.recommenders-952971f5df3120b9a2bb8213f1d89670ca0a12e8.tar.gz
org.eclipse.recommenders-952971f5df3120b9a2bb8213f1d89670ca0a12e8.tar.bz2
Properly declare class-loading constraints for used 3rd-party libraries with "uses" directive.refs/changes/69/8269/2
-rw-r--r--plugins/org.eclipse.recommenders.completion.rcp.calls/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.recommenders.completion.rcp.e37/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.recommenders.completion.rcp.e38/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.recommenders.completion.rcp.overrides/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.recommenders.completion.rcp.templates/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.recommenders.completion.rcp/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.recommenders.extdoc.rcp/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.recommenders.rdk/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.recommenders.snipmatch.rcp/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.recommenders.utils/META-INF/MANIFEST.MF8
-rw-r--r--tests/org.eclipse.recommenders.tests.extdoc.rcp/META-INF/MANIFEST.MF3
11 files changed, 20 insertions, 9 deletions
diff --git a/plugins/org.eclipse.recommenders.completion.rcp.calls/META-INF/MANIFEST.MF b/plugins/org.eclipse.recommenders.completion.rcp.calls/META-INF/MANIFEST.MF
index 94a3cd7..2c1386a 100644
--- a/plugins/org.eclipse.recommenders.completion.rcp.calls/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.recommenders.completion.rcp.calls/META-INF/MANIFEST.MF
@@ -31,6 +31,7 @@ Require-Bundle: org.eclipse.recommenders.injection,
org.eclipse.jface.databinding,
org.eclipse.core.databinding,
org.eclipse.core.databinding.beans,
- org.eclipse.core.databinding.property
+ org.eclipse.core.databinding.property,
+ com.google.guava;bundle-version="[10.0.0,11.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.recommenders.completion.rcp.e37/META-INF/MANIFEST.MF b/plugins/org.eclipse.recommenders.completion.rcp.e37/META-INF/MANIFEST.MF
index 895ec36..6b4fd35 100644
--- a/plugins/org.eclipse.recommenders.completion.rcp.e37/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.recommenders.completion.rcp.e37/META-INF/MANIFEST.MF
@@ -6,5 +6,6 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: Eclispe Code Recommenders
Fragment-Host: org.eclipse.recommenders.completion.rcp
Require-Bundle: org.eclipse.jdt.core,
+ com.google.guava;bundle-version="[10.0.0,11.0.0)",
org.apache.commons.lang3
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.recommenders.completion.rcp.e38/META-INF/MANIFEST.MF b/plugins/org.eclipse.recommenders.completion.rcp.e38/META-INF/MANIFEST.MF
index 8c6d709..bf96c31 100644
--- a/plugins/org.eclipse.recommenders.completion.rcp.e38/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.recommenders.completion.rcp.e38/META-INF/MANIFEST.MF
@@ -5,5 +5,6 @@ Bundle-SymbolicName: org.eclipse.recommenders.completion.rcp.e38;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: Eclipse Code Recommenders
Fragment-Host: org.eclipse.recommenders.completion.rcp
-Require-Bundle: org.eclipse.jdt.core;bundle-version="3.8.0"
+Require-Bundle: org.eclipse.jdt.core;bundle-version="3.8.0",
+ com.google.guava;bundle-version="[10.0.0,11.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.recommenders.completion.rcp.overrides/META-INF/MANIFEST.MF b/plugins/org.eclipse.recommenders.completion.rcp.overrides/META-INF/MANIFEST.MF
index 0c8ceec..d0a39d1 100644
--- a/plugins/org.eclipse.recommenders.completion.rcp.overrides/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.recommenders.completion.rcp.overrides/META-INF/MANIFEST.MF
@@ -19,6 +19,8 @@ Require-Bundle: org.eclipse.recommenders.injection,
org.eclipse.recommenders.jayes,
org.eclipse.recommenders.utils.rcp,
org.eclipse.jface.text,
+ com.google.gson;bundle-version="[2.0.0,3.0.0)",
+ com.google.guava;bundle-version="[10.0.0,11.0.0)",
org.apache.commons.pool;bundle-version="[1.4.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.recommenders.completion.rcp.templates/META-INF/MANIFEST.MF b/plugins/org.eclipse.recommenders.completion.rcp.templates/META-INF/MANIFEST.MF
index 06850c7..6a96d4f 100644
--- a/plugins/org.eclipse.recommenders.completion.rcp.templates/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.recommenders.completion.rcp.templates/META-INF/MANIFEST.MF
@@ -19,7 +19,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.jdt.ui,
org.eclipse.recommenders.completion.rcp.calls,
org.eclipse.recommenders.injection,
- org.eclipse.core.resources
+ org.eclipse.core.resources,
+ com.google.guava;bundle-version="[10.0.0,11.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Implementation-Version: 0.1.0
diff --git a/plugins/org.eclipse.recommenders.completion.rcp/META-INF/MANIFEST.MF b/plugins/org.eclipse.recommenders.completion.rcp/META-INF/MANIFEST.MF
index 67e206b..c2c80db 100644
--- a/plugins/org.eclipse.recommenders.completion.rcp/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.recommenders.completion.rcp/META-INF/MANIFEST.MF
@@ -20,6 +20,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.recommenders.rcp,
org.eclipse.recommenders.utils,
org.eclipse.recommenders.utils.rcp,
+ com.google.guava;bundle-version="[10.0.0,11.0.0)",
org.apache.commons.lang3
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Eclipse-ExtensibleAPI: true
diff --git a/plugins/org.eclipse.recommenders.extdoc.rcp/META-INF/MANIFEST.MF b/plugins/org.eclipse.recommenders.extdoc.rcp/META-INF/MANIFEST.MF
index 2f6be28..8307917 100644
--- a/plugins/org.eclipse.recommenders.extdoc.rcp/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.recommenders.extdoc.rcp/META-INF/MANIFEST.MF
@@ -21,6 +21,7 @@ Require-Bundle: org.eclipse.recommenders.injection,
org.eclipse.core.resources,
org.eclipse.recommenders.extdoc,
org.eclipse.ui.editors,
- com.google.gson;bundle-version="[2.0.0,3.0.0)"
+ com.google.gson;bundle-version="[2.0.0,3.0.0)",
+ com.google.guava;bundle-version="[10.0.0,11.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.recommenders.rdk/META-INF/MANIFEST.MF b/plugins/org.eclipse.recommenders.rdk/META-INF/MANIFEST.MF
index 249d277..952b432 100644
--- a/plugins/org.eclipse.recommenders.rdk/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.recommenders.rdk/META-INF/MANIFEST.MF
@@ -13,6 +13,7 @@ Export-Package: org.eclipse.recommenders.rdk,
Require-Bundle: org.eclipse.recommenders.aether,
org.apache.felix.gogo.runtime;bundle-version="0.8.0",
org.apache.lucene;bundle-version="3.5.0",
+ com.google.gson;bundle-version="[2.0.0,3.0.0)",
com.google.guava;bundle-version="[10.0.0,11.0.0)",
org.apache.commons.io;bundle-version="[2.0.0,3.0.0)",
org.apache.commons.lang3;bundle-version="[3.1.0,4.0.0)",
diff --git a/plugins/org.eclipse.recommenders.snipmatch.rcp/META-INF/MANIFEST.MF b/plugins/org.eclipse.recommenders.snipmatch.rcp/META-INF/MANIFEST.MF
index 1633288..26fe484 100644
--- a/plugins/org.eclipse.recommenders.snipmatch.rcp/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.recommenders.snipmatch.rcp/META-INF/MANIFEST.MF
@@ -13,6 +13,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.jdt.ui,
org.apache.commons.httpclient;bundle-version="[3.0.0,4.0.0)",
org.apache.lucene;bundle-version="[3.0.0,4.0.0)",
+ com.google.gson;bundle-version="[2.0.0,3.0.0)",
com.google.guava;bundle-version="[10.0.0,11.0.0)",
org.eclipse.recommenders.utils
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.recommenders.utils/META-INF/MANIFEST.MF b/plugins/org.eclipse.recommenders.utils/META-INF/MANIFEST.MF
index b5954c2..eda5a8e 100644
--- a/plugins/org.eclipse.recommenders.utils/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.recommenders.utils/META-INF/MANIFEST.MF
@@ -8,12 +8,12 @@ Export-Package: org.eclipse.recommenders.internal.utils.codestructs,
org.eclipse.recommenders.utils,
org.eclipse.recommenders.utils.annotations,
org.eclipse.recommenders.utils.archive,
- org.eclipse.recommenders.utils.gson,
+ org.eclipse.recommenders.utils.gson;uses:="com.google.common.collect,com.google.gson",
org.eclipse.recommenders.utils.names,
- org.eclipse.recommenders.utils.parser
+ org.eclipse.recommenders.utils.parser;uses:="com.google.common.base"
Require-Bundle: org.apache.commons.lang3;bundle-version="[3.0.0,4.0.0)",
- com.google.guava;bundle-version="[10.0.0,11.0.0)";visibility:=reexport,
- com.google.gson;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ com.google.gson;bundle-version="[2.0.0,3.0.0)",
+ com.google.guava;bundle-version="[10.0.0,11.0.0)",
org.slf4j.api;bundle-version="[1.6.0,2.0.0)",
org.eclipse.osgi,
org.apache.commons.io;bundle-version="[2.0.0,3.0.0)"
diff --git a/tests/org.eclipse.recommenders.tests.extdoc.rcp/META-INF/MANIFEST.MF b/tests/org.eclipse.recommenders.tests.extdoc.rcp/META-INF/MANIFEST.MF
index 62e1b87..40c4c14 100644
--- a/tests/org.eclipse.recommenders.tests.extdoc.rcp/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.recommenders.tests.extdoc.rcp/META-INF/MANIFEST.MF
@@ -5,7 +5,8 @@ Bundle-SymbolicName: org.eclipse.recommenders.tests.extdoc.rcp;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: Eclipse Code Recommenders
Fragment-Host: org.eclipse.recommenders.extdoc.rcp
-Require-Bundle: org.junit4,
+Require-Bundle: com.google.guava;bundle-version="[10.0.0,11.0.0)",
+ org.junit4,
org.mockito,
org.objenesis,
org.hamcrest,