Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto E. Escobar2014-08-26 00:49:07 +0000
committerRoberto E. Escobar2014-09-29 22:58:24 +0000
commitd0954450ad4de5faad38547d457ecbe42e077706 (patch)
treed57c9f36cea231182a348fee642969eb94f768c3
parentd2bfa4a133dcfa7a912ea67f4cc5eb567ad192f0 (diff)
downloadorg.eclipse.osee-d0954450ad4de5faad38547d457ecbe42e077706.tar.gz
org.eclipse.osee-d0954450ad4de5faad38547d457ecbe42e077706.tar.xz
org.eclipse.osee-d0954450ad4de5faad38547d457ecbe42e077706.zip
bug[ats_ATS102385]: Fix guava bundle resolution
-rw-r--r--plugins/org.eclipse.osee.cache.admin/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.osee.coverage/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.define.report/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.executor.admin/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.osee.framework.access/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.osee.jaxrs.client/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.osee.orcs.account.admin/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.osee.orcs.test/META-INF/MANIFEST.MF4
16 files changed, 32 insertions, 32 deletions
diff --git a/plugins/org.eclipse.osee.cache.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.cache.admin/META-INF/MANIFEST.MF
index 549c67d562b..00af0dffba6 100644
--- a/plugins/org.eclipse.osee.cache.admin/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.cache.admin/META-INF/MANIFEST.MF
@@ -5,10 +5,10 @@ Bundle-SymbolicName: org.eclipse.osee.cache.admin
Bundle-Version: 0.19.0.qualifier
Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: com.google.common.base,
- com.google.common.cache,
- com.google.common.collect,
- com.google.common.util.concurrent,
+Import-Package: com.google.common.base;version="[11.0.0,15.0.0)",
+ com.google.common.cache;version="[11.0.0,15.0.0)",
+ com.google.common.collect;version="[11.0.0,15.0.0)",
+ com.google.common.util.concurrent;version="[11.0.0,15.0.0)",
org.eclipse.osee.framework.jdk.core.type
Service-Component: OSGI-INF/*.xml
Export-Package: org.eclipse.osee.cache.admin
diff --git a/plugins/org.eclipse.osee.coverage/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.coverage/META-INF/MANIFEST.MF
index 0a65777960a..a66a342de41 100644
--- a/plugins/org.eclipse.osee.coverage/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.coverage/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.osee.coverage.internal.Activator
Bundle-Vendor: Eclipse Open System Engineering Environment
Eclipse-ExtensibleAPI: true
Bundle-ActivationPolicy: lazy
-Import-Package: com.google.common.collect,
+Import-Package: com.google.common.collect;version="[11.0.0,15.0.0)",
com.lowagie.text,
com.lowagie.text.pdf,
org.apache.commons.lang,
diff --git a/plugins/org.eclipse.osee.define.report/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.define.report/META-INF/MANIFEST.MF
index 6105acb184f..05cdc8724fc 100644
--- a/plugins/org.eclipse.osee.define.report/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.define.report/META-INF/MANIFEST.MF
@@ -5,8 +5,8 @@ Bundle-SymbolicName: org.eclipse.osee.define.report
Bundle-Version: 0.19.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/*.xml
-Import-Package: com.google.common.base,
- com.google.common.collect,
+Import-Package: com.google.common.base;version="[11.0.0,15.0.0)",
+ com.google.common.collect;version="[11.0.0,15.0.0)",
javax.ws.rs,
javax.ws.rs.core,
org.eclipse.osee.app,
diff --git a/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF
index d1543d25114..fab9ee6826e 100644
--- a/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF
@@ -34,7 +34,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.nebula.widgets.xviewer,
org.eclipse.osee.framework.help.ui
Bundle-ActivationPolicy: lazy
-Import-Package: com.google.common.collect,
+Import-Package: com.google.common.collect;version="[11.0.0,15.0.0)",
org.apache.commons.lang;version="2.4.0",
org.eclipse.osee.ats.api.user,
org.eclipse.osee.framework.access,
diff --git a/plugins/org.eclipse.osee.executor.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.executor.admin/META-INF/MANIFEST.MF
index 2f25b45cad5..807c8c359ab 100644
--- a/plugins/org.eclipse.osee.executor.admin/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.executor.admin/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@ Bundle-Version: 0.19.0.qualifier
Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.osee.executor.admin
-Import-Package: com.google.common.collect,
- com.google.common.util.concurrent,
+Import-Package: com.google.common.collect;version="[11.0.0,15.0.0)",
+ com.google.common.util.concurrent;version="[11.0.0,15.0.0)",
org.eclipse.osee.event,
org.eclipse.osee.logger
Service-Component: OSGI-INF/*.xml
diff --git a/plugins/org.eclipse.osee.framework.access/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.access/META-INF/MANIFEST.MF
index a8a4f6b96ed..41ef2c61511 100644
--- a/plugins/org.eclipse.osee.framework.access/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.access/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.framework.access;singleton:=true
Bundle-Version: 0.19.0.qualifier
Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: com.google.common.cache,
+Import-Package: com.google.common.cache;version="[11.0.0,15.0.0)",
org.eclipse.core.resources,
org.eclipse.core.runtime,
org.eclipse.osee.framework.core.data,
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.manager.servlet/META-INF/MANIFEST.MF
index 9881c93b11a..894e444ebf3 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/META-INF/MANIFEST.MF
@@ -4,8 +4,8 @@ Bundle-Name: Servlet Plug-in
Bundle-SymbolicName: org.eclipse.osee.framework.manager.servlet
Bundle-Version: 0.19.0.qualifier
Bundle-ActivationPolicy: lazy
-Import-Package: com.google.common.base,
- com.google.common.collect,
+Import-Package: com.google.common.base;version="[11.0.0,15.0.0)",
+ com.google.common.collect;version="[11.0.0,15.0.0)",
javax.servlet,
javax.servlet.http,
javax.ws.rs,
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF
index 13b21a64480..4a631bbc5c2 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF
@@ -8,9 +8,9 @@ Bundle-Activator: org.eclipse.osee.framework.ui.skynet.internal.Activator
Service-Component: OSGI-INF/*.xml
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse Open System Engineering Environment
-Import-Package: com.google.common.base,
- com.google.common.cache,
- com.google.common.collect,
+Import-Package: com.google.common.base;version="[11.0.0,15.0.0)",
+ com.google.common.cache;version="[11.0.0,15.0.0)",
+ com.google.common.collect;version="[11.0.0,15.0.0)",
com.lowagie.text,
com.lowagie.text.html,
com.lowagie.text.pdf,
diff --git a/plugins/org.eclipse.osee.jaxrs.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.jaxrs.client/META-INF/MANIFEST.MF
index 683d081ceee..f86ff770348 100644
--- a/plugins/org.eclipse.osee.jaxrs.client/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.jaxrs.client/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@ Bundle-Version: 0.19.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-ActivationPolicy: lazy
-Import-Package: com.google.common.base,
- com.google.common.cache,
+Import-Package: com.google.common.base;version="[11.0.0,15.0.0)",
+ com.google.common.cache;version="[11.0.0,15.0.0)",
javax.annotation;version="1.2.0",
javax.servlet;version="2.6.0",
javax.servlet.http;version="2.6.0",
diff --git a/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF
index f7b2df1c5a1..96998091b9a 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.jaxrs.server/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@ Bundle-Version: 0.19.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/*.xml
Osee-Template: OSEE-INF/templates/*.html
-Import-Package: com.google.common.cache,
- com.google.common.io,
+Import-Package: com.google.common.cache;version="[11.0.0,15.0.0)",
+ com.google.common.io;version="[11.0.0,15.0.0)",
javax.annotation;version="1.2.0",
javax.annotation.security;version="1.2.0",
javax.servlet;version="2.6.0",
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.account.admin/META-INF/MANIFEST.MF
index 745e1dc53e1..d658319f00f 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.account.admin/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.19.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: Eclipse Open System Engineering Environment
Service-Component: OSGI-INF/*.xml
-Import-Package: com.google.common.io,
+Import-Package: com.google.common.io;version="[11.0.0,15.0.0)",
com.google.gson,
com.google.gson.reflect,
org.eclipse.osee.account.admin,
diff --git a/plugins/org.eclipse.osee.orcs.core.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.core.test/META-INF/MANIFEST.MF
index 868a17c8a3d..d49ade5c746 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.core.test/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.19.0.qualifier
Bundle-Vendor: Eclipse Open System Engineering Environment
Fragment-Host: org.eclipse.osee.orcs.core
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: com.google.common.util.concurrent,
+Import-Package: com.google.common.util.concurrent;version="[11.0.0,15.0.0)",
org.eclipse.core.runtime,
org.eclipse.osee.framework.core.enums,
org.eclipse.osee.framework.core.model.cache,
diff --git a/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF
index 332c0eab41d..574b6e4051f 100644
--- a/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF
@@ -6,9 +6,9 @@ Bundle-Version: 0.19.0.qualifier
Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/*.xml
-Import-Package: com.google.common.base,
- com.google.common.collect,
- com.google.common.io,
+Import-Package: com.google.common.base;version="[11.0.0,15.0.0)",
+ com.google.common.collect;version="[11.0.0,15.0.0)",
+ com.google.common.io;version="[11.0.0,15.0.0)",
org.eclipse.core.runtime,
org.eclipse.emf.common.util,
org.eclipse.emf.ecore,
diff --git a/plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF
index bbbe3da9391..9e8d7eaf8cc 100644
--- a/plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF
@@ -6,9 +6,9 @@ Bundle-Version: 0.19.0.qualifier
Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/*.xml
-Import-Package: com.google.common.base,
- com.google.common.collect,
- com.google.common.io,
+Import-Package: com.google.common.base;version="[11.0.0,15.0.0)",
+ com.google.common.collect;version="[11.0.0,15.0.0)",
+ com.google.common.io;version="[11.0.0,15.0.0)",
org.eclipse.core.runtime,
org.eclipse.osee.console.admin,
org.eclipse.osee.database.schema,
diff --git a/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF
index 6ec792c88e7..05ed012f10d 100644
--- a/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@ Bundle-Version: 0.19.0.qualifier
Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/*.xml
-Import-Package: com.google.common.base,
- com.google.common.collect,
+Import-Package: com.google.common.base;version="[11.0.0,15.0.0)",
+ com.google.common.collect;version="[11.0.0,15.0.0)",
com.google.gson,
javax.ws.rs,
javax.ws.rs.core,
diff --git a/plugins/org.eclipse.osee.orcs.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.test/META-INF/MANIFEST.MF
index fbcc0a91858..9ee7d2e9d25 100644
--- a/plugins/org.eclipse.osee.orcs.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.test/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@ Bundle-Version: 0.19.0.qualifier
Bundle-Vendor: Eclipse Open System Engineering Environment
Fragment-Host: org.eclipse.osee.orcs
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: com.google.common.base,
- com.google.common.collect,
+Import-Package: com.google.common.base;version="[11.0.0,15.0.0)",
+ com.google.common.collect;version="[11.0.0,15.0.0)",
org.eclipse.osee.event,
org.eclipse.osee.framework.core.services,
org.eclipse.osee.framework.database,

Back to the top