You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2022/05/31 13:35:13 UTC
[sling-org-apache-sling-oak-restrictions] branch master updated: SLING-11353: Upgrade to sling 47 (#2)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-oak-restrictions.git
The following commit(s) were added to refs/heads/master by this push:
new 475f523 SLING-11353: Upgrade to sling 47 (#2)
475f523 is described below
commit 475f523e655734d14c0ae35bcf81a4bd36ab8a9b
Author: Ashok Pelluru <37...@users.noreply.github.com>
AuthorDate: Tue May 31 15:35:08 2022 +0200
SLING-11353: Upgrade to sling 47 (#2)
---
bnd.bnd | 1 +
pom.xml | 47 +++++++++-------------
.../impl/SlingRestrictionProviderImpl.java | 7 ++--
3 files changed, 22 insertions(+), 33 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..6d8f795
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1 @@
+Import-Package: org.apache.jackrabbit.oak.api;version="[1.0,4)", *
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2160ceb..186808d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,14 +14,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>26</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>47</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.oak.restrictions</artifactId>
<version>1.0.3-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling Oak Restrictions</name>
<description>
@@ -32,32 +31,19 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-oak-restrictions.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-oak-restrictions.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-oak-restrictions.git</url>
- <tag>HEAD</tag>
- </scm>
+ <tag>HEAD</tag>
+ </scm>
+
+ <properties>
+ <sling.java.version>8</sling.java.version>
+ <project.build.outputTimestamp>1</project.build.outputTimestamp>
+ </properties>
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <!--
- org.apache.jackrabbit.oak.api: Only the classes Tree, Type and PropertyState are used in a
- very basic version to traverse the tree
- org.apache.jackrabbit.oak.util: Has changed to "0.0.0" in newer versions (only TreeUtil is used)
- -->
- <Import-Package>
- org.apache.jackrabbit.oak.api;version="[1.0,4)",
- *
- </Import-Package>
- </instructions>
- </configuration>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
@@ -78,13 +64,11 @@
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
- <version>2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
- <version>16.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -93,6 +77,11 @@
<version>2.5</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
@@ -104,8 +93,8 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.10.19</version>
+ <artifactId>mockito-core</artifactId>
+ <version>4.5.1</version>
<scope>test</scope>
</dependency>
diff --git a/src/main/java/org/apache/sling/oak/restrictions/impl/SlingRestrictionProviderImpl.java b/src/main/java/org/apache/sling/oak/restrictions/impl/SlingRestrictionProviderImpl.java
index fc05367..c904faf 100644
--- a/src/main/java/org/apache/sling/oak/restrictions/impl/SlingRestrictionProviderImpl.java
+++ b/src/main/java/org/apache/sling/oak/restrictions/impl/SlingRestrictionProviderImpl.java
@@ -21,8 +21,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
@@ -37,6 +35,8 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.osgi.service.component.annotations.Component;
+
/** Sling restriction provider implementation that supports the following restrictions:
*
* <ul>
@@ -46,8 +46,7 @@ import org.slf4j.LoggerFactory;
*
* Further sling restriction can be added here in future.
*/
-@Component
-@Service(RestrictionProvider.class)
+@Component(service = {RestrictionProvider.class})
public class SlingRestrictionProviderImpl extends AbstractRestrictionProvider {
private static final Logger LOG = LoggerFactory.getLogger(SlingRestrictionProviderImpl.class);