OAK-6511 - Switch to official OSGi versioning annotations

Changes the annotations from aQute.bnd.annotation to org.osgi.annotation.versioning. As the baselining checks have complained, some packages received a micro version bump. This should be harmless however, import ranges are at most minor, and usually major. In some modules the bndlib dependency was outright removed, as it was not used at all. git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1804431 13f79535-47bb-0310-9956-ffa450edef68
adubrov · Aug 8, 2017 · a5b63fd · a5b63fd
1 parent 956b01e
commit a5b63fd
Show file tree

Hide file tree

Showing 86 changed files with 102 additions and 176 deletions.
diff --git a/oak-api/pom.xml b/oak-api/pom.xml
@@ -87,8 +87,8 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>biz.aQute.bnd</groupId>
-      <artifactId>biz.aQute.bndlib</artifactId>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.annotation</artifactId>
       <scope>provided</scope>
     </dependency>
 

diff --git a/oak-api/src/main/java/org/apache/jackrabbit/oak/api/QueryEngine.java b/oak-api/src/main/java/org/apache/jackrabbit/oak/api/QueryEngine.java
@@ -23,7 +23,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * The query engine allows to parse and execute queries.

diff --git a/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/CacheStatsMBean.java b/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/CacheStatsMBean.java
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.oak.api.jmx;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 @ProviderType
 public interface CacheStatsMBean {

diff --git a/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/CheckpointMBean.java b/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/CheckpointMBean.java
@@ -22,7 +22,7 @@
 import javax.management.openmbean.CompositeData;
 import javax.management.openmbean.TabularData;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 import java.util.Date;
 

diff --git a/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/ConsolidatedCacheStatsMBean.java b/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/ConsolidatedCacheStatsMBean.java
@@ -21,7 +21,7 @@
 
 import javax.management.openmbean.TabularData;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 @ProviderType
 public interface ConsolidatedCacheStatsMBean {

diff --git a/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/CopyOnWriteStoreMBean.java b/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/CopyOnWriteStoreMBean.java
@@ -19,7 +19,7 @@
 
 package org.apache.jackrabbit.oak.api.jmx;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 import javax.management.openmbean.TabularData;
 

diff --git a/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/FileStoreBackupRestoreMBean.java b/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/FileStoreBackupRestoreMBean.java
@@ -22,7 +22,7 @@
 import javax.annotation.Nonnull;
 import javax.management.openmbean.CompositeData;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * MBean for backing up and restoring a {@code NodeStore}.

diff --git a/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java b/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java
@@ -20,7 +20,7 @@
 import javax.management.openmbean.CompositeData;
 import javax.management.openmbean.TabularData;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 @ProviderType
 public interface IndexStatsMBean {

diff --git a/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexerMBean.java b/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexerMBean.java
@@ -22,7 +22,7 @@
 
 import java.io.IOException;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 import org.apache.jackrabbit.oak.api.CommitFailedException;
 
 @ProviderType

diff --git a/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/PersistentCacheStatsMBean.java b/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/PersistentCacheStatsMBean.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 import javax.management.openmbean.CompositeData;
 

diff --git a/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/QueryEngineSettingsMBean.java b/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/QueryEngineSettingsMBean.java
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.oak.api.jmx;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 @ProviderType
 public interface QueryEngineSettingsMBean {

diff --git a/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/RepositoryManagementMBean.java b/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/RepositoryManagementMBean.java
@@ -24,7 +24,7 @@
 import javax.management.openmbean.CompositeData;
 import javax.management.openmbean.TabularData;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * This interface exposes repository management operations and the status

diff --git a/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/RepositoryStatsMBean.java b/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/RepositoryStatsMBean.java
@@ -21,7 +21,7 @@
 
 import javax.management.openmbean.CompositeData;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * MBean for providing repository wide statistics.

diff --git a/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/SessionMBean.java b/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/SessionMBean.java
@@ -19,7 +19,7 @@
 
 package org.apache.jackrabbit.oak.api.jmx;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 import org.apache.jackrabbit.oak.api.AuthInfo;
 
 /**

diff --git a/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/package-info.java b/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/package-info.java
@@ -16,9 +16,7 @@
  */
 
 @Version("4.7.0")
-@Export(optional = "provide:=true")
 package org.apache.jackrabbit.oak.api.jmx;
 
-import aQute.bnd.annotation.Export;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
 
diff --git a/oak-api/src/main/java/org/apache/jackrabbit/oak/api/package-info.java b/oak-api/src/main/java/org/apache/jackrabbit/oak/api/package-info.java
@@ -18,10 +18,8 @@
 /**
  * Oak repository API
  */
-@Version("3.1.0")
-@Export(optional = "provide:=true")
+@Version("3.1.1")
 package org.apache.jackrabbit.oak.api;
 
-import aQute.bnd.annotation.Export;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
 
diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml
@@ -73,16 +73,16 @@
             <artifactId>org.apache.felix.jaas</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>biz.aQute.bnd</groupId>
-            <artifactId>biz.aQute.bndlib</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.annotation</artifactId>
+            <scope>provided</scope>        
+        </dependency>
 
         <!-- Jackrabbit dependencies -->
         <dependency>

diff --git a/...va/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/package-info.java b/...va/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/package-info.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 @Version("1.3.0")
-@Export
 package org.apache.jackrabbit.oak.spi.security.authentication.external.basic;
 
-import aQute.bnd.annotation.Version;
-import aQute.bnd.annotation.Export;
+import org.osgi.annotation.versioning.Version;
diff --git a/...he/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynchronizationMBean.java b/...he/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynchronizationMBean.java
@@ -18,7 +18,7 @@
 
 import javax.annotation.Nonnull;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Provides utilities to manage synchronized external identities.

diff --git a/...ain/java/org/apache/jackrabbit/oak/spi/security/authentication/external/package-info.java b/...ain/java/org/apache/jackrabbit/oak/spi/security/authentication/external/package-info.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 @Version("2.3.0")
-@Export
 package org.apache.jackrabbit.oak.spi.security.authentication.external;
 
-import aQute.bnd.annotation.Version;
-import aQute.bnd.annotation.Export;
+import org.osgi.annotation.versioning.Version;
diff --git a/oak-auth-ldap/pom.xml b/oak-auth-ldap/pom.xml
@@ -133,11 +133,6 @@
             <version>2.7.7</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>biz.aQute.bnd</groupId>
-            <artifactId>biz.aQute.bndlib</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>

diff --git a/oak-authorization-cug/pom.xml b/oak-authorization-cug/pom.xml
@@ -114,8 +114,8 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>biz.aQute.bnd</groupId>
-      <artifactId>biz.aQute.bndlib</artifactId>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.annotation</artifactId>
       <scope>provided</scope>
     </dependency>
 

diff --git a/...ug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/CugExclude.java b/...ug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/CugExclude.java
@@ -23,11 +23,13 @@
 import org.apache.jackrabbit.oak.spi.security.principal.AdminPrincipal;
 import org.apache.jackrabbit.oak.spi.security.principal.SystemPrincipal;
 import org.apache.jackrabbit.oak.spi.security.principal.SystemUserPrincipal;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Interface that allows to exclude certain principals from the CUG evaluation.
  * For the excluded principals the closed user group policies will be ignored.
  */
+@ProviderType
 public interface CugExclude {
 
     boolean isExcluded(@Nonnull Set<Principal> principals);

diff --git a/...cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/CugPolicy.java b/...cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/CugPolicy.java
@@ -18,10 +18,12 @@
 
 import org.apache.jackrabbit.api.security.JackrabbitAccessControlPolicy;
 import org.apache.jackrabbit.api.security.authorization.PrincipalSetPolicy;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Denies read access for all principals except for the specified principals.
  */
+@ProviderType
 public interface CugPolicy extends PrincipalSetPolicy, JackrabbitAccessControlPolicy {
 
 }
diff --git a/.../src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/package-info.java b/.../src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/package-info.java
@@ -14,9 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@Version("2.0.0")
-@Export(optional = "provide:=true")
+@Version("2.0.1")
 package org.apache.jackrabbit.oak.spi.security.authorization.cug;
 
-import aQute.bnd.annotation.Export;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
diff --git a/oak-blob-cloud-azure/pom.xml b/oak-blob-cloud-azure/pom.xml
@@ -66,11 +66,6 @@
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>biz.aQute.bnd</groupId>
-            <artifactId>biz.aQute.bndlib</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>

diff --git a/oak-blob-cloud/pom.xml b/oak-blob-cloud/pom.xml
@@ -60,11 +60,6 @@
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>biz.aQute.bnd</groupId>
-            <artifactId>biz.aQute.bndlib</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>

diff --git a/oak-blob-plugins/pom.xml b/oak-blob-plugins/pom.xml
@@ -74,11 +74,6 @@
       <artifactId>org.osgi.compendium</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>biz.aQute.bnd</groupId>
-      <artifactId>biz.aQute.bndlib</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.scr.annotations</artifactId>

diff --git a/oak-blob/pom.xml b/oak-blob/pom.xml
@@ -64,8 +64,8 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>biz.aQute.bnd</groupId>
-      <artifactId>biz.aQute.bndlib</artifactId>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.annotation</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/GarbageCollectableBlobStore.java b/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/GarbageCollectableBlobStore.java
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.oak.spi.blob;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 import java.io.IOException;
 import java.util.Iterator;

diff --git a/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/stats/BlobStatsCollector.java b/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/stats/BlobStatsCollector.java
@@ -21,7 +21,7 @@
 
 import java.util.concurrent.TimeUnit;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * BlobStoreStatsCollector receives callback when blobs are written and read

diff --git a/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/stats/BlobStoreStatsMBean.java b/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/stats/BlobStoreStatsMBean.java
@@ -21,7 +21,7 @@
 
 import javax.management.openmbean.CompositeData;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 @ProviderType
 public interface BlobStoreStatsMBean {

diff --git a/oak-commons/pom.xml b/oak-commons/pom.xml
@@ -62,11 +62,6 @@
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
     </dependency>
-    <dependency>
-        <groupId>biz.aQute.bnd</groupId>
-        <artifactId>biz.aQute.bndlib</artifactId>
-        <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>

diff --git a/oak-core-spi/pom.xml b/oak-core-spi/pom.xml
@@ -93,8 +93,8 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>biz.aQute.bnd</groupId>
-      <artifactId>biz.aQute.bndlib</artifactId>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.annotation</artifactId>
       <scope>provided</scope>
     </dependency>
 

diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/Mount.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/Mount.java
@@ -19,7 +19,7 @@
 
 package org.apache.jackrabbit.oak.spi.mount;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Refers to a set of paths from a <tt>ContentRepository</tt> that are possibly 

diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/MountInfoProvider.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/MountInfoProvider.java
@@ -24,7 +24,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Holds information related to the {@link Mount}s configured in a <tt>ContentRepository</tt>.

diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/package-info.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/package-info.java
@@ -19,4 +19,4 @@
 @Version("3.0.0")
 package org.apache.jackrabbit.oak.spi.mount;
 
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;