Bug 544144 - Use Import-Package for Apache dependencies

- Changed Require-Bundle to Import-Package for
  org.apache.http.* and org.apache.commons.*
- Added "uses" declarations
- Bumped bundle micro version

Change-Id: Idb3b7f1c176f15cea58dde2a5cd633358bdd5930
Signed-off-by: Carsten Reckord <reckord@yatta.de>

14 files changed, 97 insertions, 45 deletions

diff --git a/org.eclipse.userstorage-feature/feature.xml b/org.eclipse.userstorage-feature/feature.xml
index c90dcec..91750b2 100644
--- a/org.eclipse.userstorage-feature/feature.xml
+++ b/org.eclipse.userstorage-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.userstorage"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.1.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.userstorage.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.userstorage-feature/pom.xml b/org.eclipse.userstorage-feature/pom.xml
index b59adf8..d5bb720 100644
--- a/org.eclipse.userstorage-feature/pom.xml
+++ b/org.eclipse.userstorage-feature/pom.xml
@@ -26,6 +26,6 @@
   <name>org.eclipse.userstorage-feature</name>
   <groupId>org.eclipse.userstorage.features</groupId>
   <artifactId>org.eclipse.userstorage</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.1.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/org.eclipse.userstorage.oauth.tests/META-INF/MANIFEST.MF b/org.eclipse.userstorage.oauth.tests/META-INF/MANIFEST.MF
index 48f8063..6ea59d5 100644
--- a/org.eclipse.userstorage.oauth.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.userstorage.oauth.tests/META-INF/MANIFEST.MF
@@ -7,4 +7,6 @@ Bundle-Vendor: Eclipse.org
 Fragment-Host: org.eclipse.userstorage.oauth;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.junit;bundle-version="4.12.0",
- org.mockito
+ org.mockito,
+ org.apache.httpcomponents.httpclient;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
+ org.apache.httpcomponents.httpcore;bundle-version="[4.0.0,5.0.0)";visibility:=reexport 
diff --git a/org.eclipse.userstorage.oauth/.settings/org.eclipse.pde.core.prefs b/org.eclipse.userstorage.oauth/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000..923c37f
--- /dev/null
+++ b/org.eclipse.userstorage.oauth/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+resolve.requirebundle=false
diff --git a/org.eclipse.userstorage.oauth/META-INF/MANIFEST.MF b/org.eclipse.userstorage.oauth/META-INF/MANIFEST.MF
index 443c902..6888a34 100644
--- a/org.eclipse.userstorage.oauth/META-INF/MANIFEST.MF
+++ b/org.eclipse.userstorage.oauth/META-INF/MANIFEST.MF
@@ -1,26 +1,47 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.userstorage.oauth;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.userstorage;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.userstorage.ui;bundle-version="[1.0.2,2.0.0)",
- org.eclipse.core.net;bundle-version="[1.2.0,2.0.0)",
- org.apache.httpcomponents.httpclient;bundle-version="[4.3.0,5.0.0)",
- org.apache.httpcomponents.httpcore;bundle-version="[4.3.0,5.0.0)",
- org.apache.commons.codec;bundle-version="[1.6.0,2.0.0)",
- org.eclipse.jface;bundle-version="[3.6.0,4.0.0)",
+Require-Bundle: org.eclipse.userstorage.ui;bundle-version="[1.0.2,2.0.0)",
  org.eclipse.ui;bundle-version="[3.6.0,4.0.0)"
-Export-Package: org.eclipse.userstorage.internal.oauth;x-internal:=true,
- org.eclipse.userstorage.internal.oauth.ui;x-internal:=true,
+Import-Package: org.apache.http;version="[4.3.0,5.0.0)",
+ org.apache.http.client;version="[4.3.0,5.0.0)",
+ org.apache.http.client.fluent;version="[4.3.0,5.0.0)",
+ org.apache.http.client.utils;version="[4.3.0,5.0.0)",
+ org.apache.http.entity;version="[4.3.0,5.0.0)",
+ org.apache.http.message;version="[4.3.0,5.0.0)",
+ org.apache.http.util;version="[4.3.0,5.0.0)",
+ org.eclipse.core.runtime;version="3.3.0",
+ org.osgi.framework;version="1.7.0"
+Export-Package: org.eclipse.userstorage.internal.oauth;x-internal:=true;
+  uses:="org.eclipse.core.runtime,
+   org.eclipse.userstorage.oauth,
+   org.eclipse.userstorage.spi,
+   org.eclipse.userstorage,
+   org.eclipse.userstorage.internal",
+ org.eclipse.userstorage.internal.oauth.ui;x-internal:=true;
+  uses:="org.eclipse.jface.window,
+   org.eclipse.jface.action,
+   org.eclipse.swt.graphics,
+   org.eclipse.swt.widgets,
+   org.eclipse.jface.dialogs,
+   org.eclipse.ui,
+   org.eclipse.ui.menus,
+   org.eclipse.core.runtime,
+   org.eclipse.ui.services,
+   org.eclipse.jface.resource,
+   org.eclipse.jface.preference,
+   org.eclipse.userstorage.internal.oauth",
  org.eclipse.userstorage.oauth;version="1.0.0";
-  uses:="org.apache.http.client.fluent"
+  uses:="org.eclipse.jface.window,
+   org.eclipse.userstorage.spi,
+   org.eclipse.userstorage,
+   org.apache.http.client.fluent,
+   org.eclipse.userstorage.internal.oauth,
+   org.eclipse.userstorage.internal"
 Eclipse-BuddyPolicy: registered
-Import-Package: org.eclipse.core.runtime;version="3.3.0",
- org.eclipse.core.runtime.preferences;version="3.3.0",
- org.osgi.framework;version="1.7.0",
- org.osgi.service.prefs;version="1.1.1"
diff --git a/org.eclipse.userstorage.oauth/pom.xml b/org.eclipse.userstorage.oauth/pom.xml
index 46efb33..c26e521 100644
--- a/org.eclipse.userstorage.oauth/pom.xml
+++ b/org.eclipse.userstorage.oauth/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>org.eclipse.userstorage</groupId>
   <artifactId>org.eclipse.userstorage.oauth</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.0.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.eclipse.userstorage.sdk-feature/feature.xml b/org.eclipse.userstorage.sdk-feature/feature.xml
index 4a33d92..ad43c02 100644
--- a/org.eclipse.userstorage.sdk-feature/feature.xml
+++ b/org.eclipse.userstorage.sdk-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.userstorage.sdk"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.1.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.userstorage.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.userstorage.sdk-feature/pom.xml b/org.eclipse.userstorage.sdk-feature/pom.xml
index 3c23121..9a618ad 100644
--- a/org.eclipse.userstorage.sdk-feature/pom.xml
+++ b/org.eclipse.userstorage.sdk-feature/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>org.eclipse.userstorage.features</groupId>
   <artifactId>org.eclipse.userstorage.sdk</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.1.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/org.eclipse.userstorage.ui/.settings/org.eclipse.pde.core.prefs b/org.eclipse.userstorage.ui/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000..923c37f
--- /dev/null
+++ b/org.eclipse.userstorage.ui/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+resolve.requirebundle=false
diff --git a/org.eclipse.userstorage.ui/META-INF/MANIFEST.MF b/org.eclipse.userstorage.ui/META-INF/MANIFEST.MF
index 2a1447f..271d330 100644
--- a/org.eclipse.userstorage.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.userstorage.ui/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.userstorage.ui;singleton:=true
-Bundle-Version: 1.0.2.qualifier
+Bundle-Version: 1.0.3.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -9,12 +9,32 @@ Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.userstorage.ui.internal.Activator
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jface;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
- org.apache.httpcomponents.httpclient;bundle-version="[4.3.0,5.0.0)",
- org.apache.httpcomponents.httpcore;bundle-version="[4.3.0,5.0.0)",
  org.eclipse.userstorage;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
  org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)"
-Export-Package: org.eclipse.userstorage.ui;version="1.0.0",
- org.eclipse.userstorage.ui.internal;version="1.0.0";x-internal:=true
-Import-Package: org.eclipse.userstorage.internal
+Import-Package: org.eclipse.userstorage.internal,
+ org.apache.http;version="[4.3.0,5.0.0)",
+ org.apache.http.client.fluent;version="[4.3.0,5.0.0)"
+Export-Package: org.eclipse.userstorage.ui;version="1.0.0";
+  uses:="org.eclipse.swt.graphics,
+   org.eclipse.swt.widgets,
+   org.eclipse.jface.dialogs,
+   org.eclipse.userstorage,
+   org.eclipse.jface.viewers",
+ org.eclipse.userstorage.ui.internal;version="1.0.0";x-internal:=true;
+  uses:="org.eclipse.swt.events,
+   org.eclipse.swt.layout,
+   org.eclipse.swt.graphics,
+   org.eclipse.userstorage.ui,
+   org.eclipse.swt.widgets,
+   org.eclipse.userstorage.spi,
+   org.eclipse.jface.dialogs,
+   org.eclipse.core.commands,
+   org.eclipse.jface.viewers,
+   org.eclipse.ui.plugin,
+   org.osgi.framework,
+   org.eclipse.ui,
+   org.eclipse.core.runtime,
+   org.eclipse.jface.preference,
+   org.eclipse.userstorage,
+   org.eclipse.userstorage.internal"
diff --git a/org.eclipse.userstorage.ui/pom.xml b/org.eclipse.userstorage.ui/pom.xml
index 3a922ab..e128f8d 100644
--- a/org.eclipse.userstorage.ui/pom.xml
+++ b/org.eclipse.userstorage.ui/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>org.eclipse.userstorage</groupId>
   <artifactId>org.eclipse.userstorage.ui</artifactId>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>1.0.3-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.eclipse.userstorage/.settings/org.eclipse.pde.core.prefs b/org.eclipse.userstorage/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000..923c37f
--- /dev/null
+++ b/org.eclipse.userstorage/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+resolve.requirebundle=false
diff --git a/org.eclipse.userstorage/META-INF/MANIFEST.MF b/org.eclipse.userstorage/META-INF/MANIFEST.MF
index c45e379..80fb82c 100644
--- a/org.eclipse.userstorage/META-INF/MANIFEST.MF
+++ b/org.eclipse.userstorage/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.userstorage;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,26 +10,29 @@ Bundle-Activator: org.eclipse.userstorage.internal.Activator
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.net;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.equinox.common;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)",
- org.apache.httpcomponents.httpclient;bundle-version="[4.3.0,5.0.0)",
- org.apache.httpcomponents.httpcore;bundle-version="[4.3.0,5.0.0)",
- org.apache.commons.logging;bundle-version="[1.0.0,2.0.0)",
- org.apache.commons.codec;bundle-version="[1.6.0,2.0.0)"
-Export-Package: org.eclipse.userstorage;version="1.0.0",
+ org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)"
+Import-Package: org.apache.commons.codec.binary;version="[1.6.0,2.0.0)",
+ org.apache.http;version="[4.3.0,5.0.0)",
+ org.apache.http.auth;version="[4.3.0,5.0.0)",
+ org.apache.http.client;version="[4.3.0,5.0.0)",
+ org.apache.http.client.fluent;version="[4.3.0,5.0.0)",
+ org.apache.http.impl.client;version="[4.3.0,5.0.0)",
+ org.apache.http.message;version="[4.3.0,5.0.0)"
+Export-Package: org.eclipse.userstorage;version="1.0.0";uses:="org.eclipse.userstorage.spi",
  org.eclipse.userstorage.internal;version="1.1.0";
-  uses:="org.apache.http.client.fluent,org.apache.http";
   x-friends:="org.eclipse.userstorage.tests,
    org.eclipse.userstorage.oauth,
    org.eclipse.userstorage.ui,
-   org.eclipse.userstorage.sdk",
+   org.eclipse.userstorage.sdk";
+  uses:="org.apache.http.client.fluent,
+   org.apache.http",
  org.eclipse.userstorage.internal.util;version="1.0.0";
-  uses:="org.apache.http.client.fluent,org.apache.http";
   x-friends:="org.eclipse.userstorage.tests,
    org.eclipse.userstorage.oauth,
    org.eclipse.userstorage.ui,
-   org.eclipse.userstorage.sdk",
- org.eclipse.userstorage.spi;version="1.1.0";
-  uses:="org.apache.http.client.fluent",
- org.eclipse.userstorage.util;version="1.0.0"
+   org.eclipse.userstorage.sdk";
+  uses:="org.apache.http.client.fluent,
+   org.apache.http",
+ org.eclipse.userstorage.spi;version="1.1.0";uses:="org.eclipse.userstorage,org.apache.http.client.fluent,org.eclipse.userstorage.internal",
+ org.eclipse.userstorage.util;version="1.0.0";uses:="org.eclipse.userstorage.spi"
 Eclipse-BuddyPolicy: registered
diff --git a/org.eclipse.userstorage/pom.xml b/org.eclipse.userstorage/pom.xml
index c8437c0..21507bb 100644
--- a/org.eclipse.userstorage/pom.xml
+++ b/org.eclipse.userstorage/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>org.eclipse.userstorage</groupId>
   <artifactId>org.eclipse.userstorage</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.1.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>