This is an automated email from the ASF dual-hosted git repository.
baedke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 71c1e9b0cf OAK-6761: Convert oak-blob-plugins to OSGi R7 annotations
(#1415)
71c1e9b0cf is described below
commit 71c1e9b0cf5c153f1d03deccd88d4e900b23cf64
Author: mbaedke <manfred.bae...@gmail.com>
AuthorDate: Tue May 28 14:07:26 2024 +0200
OAK-6761: Convert oak-blob-plugins to OSGi R7 annotations (#1415)
done
---
oak-blob-plugins/pom.xml | 4 ++--
.../oak/plugins/blob/ConsolidatedDataStoreCacheStats.java | 10 +++++-----
.../oak/plugins/blob/datastore/DbDataStoreService.java | 8 ++++----
.../oak/plugins/blob/datastore/FileDataStoreService.java | 8 ++++----
.../jackrabbit/oak/plugins/blob/migration/BlobMigration.java | 10 +++++-----
5 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/oak-blob-plugins/pom.xml b/oak-blob-plugins/pom.xml
index 69ebf77993..ff8edc0285 100644
--- a/oak-blob-plugins/pom.xml
+++ b/oak-blob-plugins/pom.xml
@@ -54,8 +54,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git
a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/ConsolidatedDataStoreCacheStats.java
b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/ConsolidatedDataStoreCacheStats.java
index 796ad9b52a..a5a8f51d2b 100644
---
a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/ConsolidatedDataStoreCacheStats.java
+++
b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/ConsolidatedDataStoreCacheStats.java
@@ -34,10 +34,10 @@ import javax.management.openmbean.TabularDataSupport;
import javax.management.openmbean.TabularType;
import org.apache.jackrabbit.guava.common.base.Strings;
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Deactivate;
-import org.apache.felix.scr.annotations.Reference;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Reference;
import org.apache.jackrabbit.core.data.DataIdentifier;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -61,7 +61,7 @@ import static
org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.registerM
/**
* Stats for caching data store.
*/
-@Component
+@Component(service = {})
public class ConsolidatedDataStoreCacheStats implements
ConsolidatedDataStoreCacheStatsMBean {
private final List<Registration> registrations = newArrayList();
diff --git
a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DbDataStoreService.java
b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DbDataStoreService.java
index fc7f69baa4..c0217f55da 100644
---
a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DbDataStoreService.java
+++
b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DbDataStoreService.java
@@ -21,16 +21,16 @@ package org.apache.jackrabbit.oak.plugins.blob.datastore;
import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.ConfigurationPolicy;
-import org.apache.felix.scr.annotations.Reference;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.ConfigurationPolicy;
+import org.osgi.service.component.annotations.Reference;
import org.apache.jackrabbit.core.data.DataStore;
import org.apache.jackrabbit.core.data.db.DbDataStore;
import org.apache.jackrabbit.core.util.db.ConnectionFactory;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
import org.osgi.service.component.ComponentContext;
-@Component(policy = ConfigurationPolicy.REQUIRE, name =
DbDataStoreService.NAME)
+@Component(configurationPolicy = ConfigurationPolicy.REQUIRE, name =
DbDataStoreService.NAME)
public class DbDataStoreService extends AbstractDataStoreService{
public static final String NAME =
"org.apache.jackrabbit.oak.plugins.blob.datastore.DbDataStore";
diff --git
a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java
b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java
index 901e9308eb..56aa76b47a 100644
---
a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java
+++
b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java
@@ -20,9 +20,9 @@
package org.apache.jackrabbit.oak.plugins.blob.datastore;
import org.apache.jackrabbit.guava.common.base.Preconditions;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.ConfigurationPolicy;
-import org.apache.felix.scr.annotations.Reference;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.ConfigurationPolicy;
+import org.osgi.service.component.annotations.Reference;
import org.apache.jackrabbit.core.data.DataStore;
import org.apache.jackrabbit.oak.commons.PropertiesUtil;
import org.apache.jackrabbit.oak.plugins.blob.AbstractSharedCachingDataStore;
@@ -38,7 +38,7 @@ import java.util.Hashtable;
import java.util.Map;
import java.util.Properties;
-@Component(policy = ConfigurationPolicy.REQUIRE, name =
FileDataStoreService.NAME)
+@Component(configurationPolicy = ConfigurationPolicy.REQUIRE, name =
FileDataStoreService.NAME)
public class FileDataStoreService extends AbstractDataStoreService {
public static final String NAME =
"org.apache.jackrabbit.oak.plugins.blob.datastore.FileDataStore";
diff --git
a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/BlobMigration.java
b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/BlobMigration.java
index 52a4002589..cb0f07d7e8 100644
---
a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/BlobMigration.java
+++
b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/BlobMigration.java
@@ -38,10 +38,10 @@ import javax.management.openmbean.OpenDataException;
import javax.management.openmbean.OpenType;
import javax.management.openmbean.SimpleType;
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Deactivate;
-import org.apache.felix.scr.annotations.Reference;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Reference;
import org.apache.jackrabbit.oak.api.jmx.RepositoryManagementMBean.StatusCode;
import org.apache.jackrabbit.oak.commons.jmx.AnnotatedStandardMBean;
import org.apache.jackrabbit.oak.commons.jmx.ManagementOperation;
@@ -56,7 +56,7 @@ import org.osgi.framework.BundleContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@Component
+@Component(service = {})
public class BlobMigration extends AnnotatedStandardMBean implements
BlobMigrationMBean {
public static final String OP_NAME = "Blob migration";
