[commons-vfs] branch master updated: Fix OSGi "Unused Import-Package instructions".

[gg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-vfs.git


The following commit(s) were added to refs/heads/master by this push:
     new 42651ca  Fix OSGi "Unused Import-Package instructions".
42651ca is described below

commit 42651ca2c5e5de6f9c88f28c1e6ffb8cd8ec37f8
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Dec 11 11:22:04 2021 -0500

    Fix OSGi "Unused Import-Package instructions".
---
 commons-vfs2-examples/pom.xml    | 3 +++
 commons-vfs2-jackrabbit1/pom.xml | 5 +++++
 commons-vfs2-jackrabbit2/pom.xml | 4 ++++
 commons-vfs2/pom.xml             | 6 ++++++
 pom.xml                          | 4 ----
 src/changes/changes.xml          | 3 +++
 6 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/commons-vfs2-examples/pom.xml b/commons-vfs2-examples/pom.xml
index 4002fea..28450d5 100644
--- a/commons-vfs2-examples/pom.xml
+++ b/commons-vfs2-examples/pom.xml
@@ -58,6 +58,9 @@
   <properties>
     <vfs.parent.dir>${basedir}/..</vfs.parent.dir>
     <japicmp.skip>true</japicmp.skip>
+    <commons.osgi.import>
+        *
+    </commons.osgi.import>
   </properties>
 
   <build>
diff --git a/commons-vfs2-jackrabbit1/pom.xml b/commons-vfs2-jackrabbit1/pom.xml
index 4939987..d9035d1 100644
--- a/commons-vfs2-jackrabbit1/pom.xml
+++ b/commons-vfs2-jackrabbit1/pom.xml
@@ -120,6 +120,11 @@
     <commons.componentid>vfs2-jackrabbit1</commons.componentid>
     <commons.packageId>vfs2-jackrabbit1</commons.packageId>
     <commons.module.name>org.apache.commons.vfs2.jackrabbit1</commons.module.name>
+    <commons.osgi.import>
+        org.apache.jackrabbit.*;resolution:=optional,
+        org.apache.commons.httpclient.*;resolution:=optional,
+        *
+    </commons.osgi.import>
   </properties>
 
   <build>
diff --git a/commons-vfs2-jackrabbit2/pom.xml b/commons-vfs2-jackrabbit2/pom.xml
index 7ee27b1..12a0f1d 100644
--- a/commons-vfs2-jackrabbit2/pom.xml
+++ b/commons-vfs2-jackrabbit2/pom.xml
@@ -118,6 +118,10 @@
     <commons.componentid>vfs2-jackrabbit2</commons.componentid>
     <commons.packageId>vfs2-jackrabbit2</commons.packageId>
     <commons.module.name>org.apache.commons.vfs2.jackrabbit2</commons.module.name>
+    <commons.osgi.import>
+        org.apache.jackrabbit.*;resolution:=optional,
+        *
+    </commons.osgi.import>
   </properties>
 
   <build>
diff --git a/commons-vfs2/pom.xml b/commons-vfs2/pom.xml
index 9920f52..7a78d47 100644
--- a/commons-vfs2/pom.xml
+++ b/commons-vfs2/pom.xml
@@ -182,6 +182,12 @@
 
   <properties>
     <vfs.parent.dir>${basedir}/..</vfs.parent.dir>
+    <commons.osgi.import>
+        org.apache.hadoop.*;resolution:=optional,
+        org.apache.tools.ant.*;resolution:=optional,
+        org.apache.commons.httpclient.*;resolution:=optional,
+        *
+    </commons.osgi.import>
   </properties>
 
   <build>
diff --git a/pom.xml b/pom.xml
index e7ac1f9..fa1bcbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,10 +182,6 @@
     <!-- make sure bundle plugin has dependency informations for 'optional' -->
     <commons.osgi.excludeDependencies />
     <commons.osgi.import>
-        org.apache.hadoop.*;resolution:=optional,
-        org.apache.jackrabbit.*;resolution:=optional,
-        org.apache.tools.ant.*;resolution:=optional,
-        org.apache.commons.httpclient.*;resolution:=optional,
         *
     </commons.osgi.import>
     <!-- Avoid warnings about being unable to find jars during site building -->
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f64462f..97d3a37 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -71,6 +71,9 @@ The <action> type attribute can be add,update,fix,remove.
       <action type="fix" issue="VFS-778" dev="ggregory" due-to="zhouwenqing, Gary Gregory">
         SFTP channel isn't returned to the pool when SftpFileObject.doGetOutputStream throws an exception. #215.
       </action>
+      <action type="fix" dev="ggregory" due-to="Gary Gregory">
+        Fix OSGi "Unused Import-Package instructions".
+      </action>
       <!-- ADD -->
       <action type="add" dev="ggregory" due-to="Seth Falco">
         Add vscode files to gitignore #205.