You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2018/09/02 20:30:31 UTC
[sling-org-apache-sling-tenant] branch master updated (8085391 ->
6adf756)
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-tenant.git.
from 8085391 SLING-7880 Avoid NPE when adapting to Tenant for a system users
new fb87d75 update to sling parent 34
new db31086 fix javadoc error
new 6adf756 switch to OSGi R6 and OSGi annotations instead of bnd annotations
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 16 ++++++----------
src/main/java/org/apache/sling/tenant/Tenant.java | 2 +-
src/main/java/org/apache/sling/tenant/TenantManager.java | 4 ++--
.../java/org/apache/sling/tenant/TenantProvider.java | 2 +-
src/main/java/org/apache/sling/tenant/package-info.java | 7 ++-----
.../org/apache/sling/tenant/spi/TenantCustomizer.java | 3 +--
.../org/apache/sling/tenant/spi/TenantManagerHook.java | 3 +--
.../java/org/apache/sling/tenant/spi/package-info.java | 5 ++---
8 files changed, 16 insertions(+), 26 deletions(-)
[sling-org-apache-sling-tenant] 02/03: fix javadoc error
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-tenant.git
commit db310864d41a4e2921a2401afe3b0ff3ac8959a4
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Sun Sep 2 22:18:48 2018 +0200
fix javadoc error
---
src/main/java/org/apache/sling/tenant/TenantManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/tenant/TenantManager.java b/src/main/java/org/apache/sling/tenant/TenantManager.java
index 94d5b55..437169a 100644
--- a/src/main/java/org/apache/sling/tenant/TenantManager.java
+++ b/src/main/java/org/apache/sling/tenant/TenantManager.java
@@ -107,7 +107,7 @@ public interface TenantManager {
* unless the {@code properties} parameter is {@code null} or empty.
*
* @param tenant The tenant from which to remove properties.
- * @param properties The list of properties to be removed. If this is
+ * @param propertyNames The list of properties to be removed. If this is
* {@code null} or empty, nothing happens and the
* {@link org.apache.sling.tenant.spi.TenantCustomizer} is not
* called.
[sling-org-apache-sling-tenant] 03/03: switch to OSGi R6 and OSGi
annotations instead of bnd annotations
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-tenant.git
commit 6adf7568b62f470d944a6473c7f93d8622848652
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Sun Sep 2 22:26:00 2018 +0200
switch to OSGi R6 and OSGi annotations instead of bnd annotations
---
pom.xml | 8 +++-----
src/main/java/org/apache/sling/tenant/Tenant.java | 2 +-
src/main/java/org/apache/sling/tenant/TenantManager.java | 2 +-
src/main/java/org/apache/sling/tenant/TenantProvider.java | 2 +-
src/main/java/org/apache/sling/tenant/package-info.java | 7 ++-----
src/main/java/org/apache/sling/tenant/spi/TenantCustomizer.java | 3 +--
src/main/java/org/apache/sling/tenant/spi/TenantManagerHook.java | 3 +--
src/main/java/org/apache/sling/tenant/spi/package-info.java | 5 ++---
8 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2d459b6..a765dcf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,8 +94,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.3.1</version><!--$NO-MVN-MAN-VER$-->
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -103,9 +102,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>biz.aQute.bndlib</artifactId>
- <version>3.3.0</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
<scope>provided</scope>
</dependency>
<!-- Webconsole -->
diff --git a/src/main/java/org/apache/sling/tenant/Tenant.java b/src/main/java/org/apache/sling/tenant/Tenant.java
index 0a911ca..95c3f17 100644
--- a/src/main/java/org/apache/sling/tenant/Tenant.java
+++ b/src/main/java/org/apache/sling/tenant/Tenant.java
@@ -20,7 +20,7 @@ package org.apache.sling.tenant;
import java.util.Iterator;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The <code>Tenant</code> interface represents a tenant which may be used to
diff --git a/src/main/java/org/apache/sling/tenant/TenantManager.java b/src/main/java/org/apache/sling/tenant/TenantManager.java
index 437169a..cfc0034 100644
--- a/src/main/java/org/apache/sling/tenant/TenantManager.java
+++ b/src/main/java/org/apache/sling/tenant/TenantManager.java
@@ -20,7 +20,7 @@ package org.apache.sling.tenant;
import java.util.Map;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The <code>TenantManager</code> service interface defines the API that
diff --git a/src/main/java/org/apache/sling/tenant/TenantProvider.java b/src/main/java/org/apache/sling/tenant/TenantProvider.java
index f810e32..6320870 100644
--- a/src/main/java/org/apache/sling/tenant/TenantProvider.java
+++ b/src/main/java/org/apache/sling/tenant/TenantProvider.java
@@ -20,7 +20,7 @@ package org.apache.sling.tenant;
import java.util.Iterator;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The <code>TenantProvider</code> defines the service interface
diff --git a/src/main/java/org/apache/sling/tenant/package-info.java b/src/main/java/org/apache/sling/tenant/package-info.java
index 7188a49..3c9e72c 100644
--- a/src/main/java/org/apache/sling/tenant/package-info.java
+++ b/src/main/java/org/apache/sling/tenant/package-info.java
@@ -17,10 +17,7 @@
* under the License.
*/
-@Version("1.0")
-@Export(optional = "provide:=true")
+@Version("1.0.1")
package org.apache.sling.tenant;
-import aQute.bnd.annotation.Export;
-import aQute.bnd.annotation.Version;
-
+import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/tenant/spi/TenantCustomizer.java b/src/main/java/org/apache/sling/tenant/spi/TenantCustomizer.java
index 345197b..8b6d007 100644
--- a/src/main/java/org/apache/sling/tenant/spi/TenantCustomizer.java
+++ b/src/main/java/org/apache/sling/tenant/spi/TenantCustomizer.java
@@ -22,8 +22,7 @@ import java.util.Map;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.tenant.Tenant;
-
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* This is a service interface to customize tenant setup and administration.
diff --git a/src/main/java/org/apache/sling/tenant/spi/TenantManagerHook.java b/src/main/java/org/apache/sling/tenant/spi/TenantManagerHook.java
index 612f086..c302d2e 100644
--- a/src/main/java/org/apache/sling/tenant/spi/TenantManagerHook.java
+++ b/src/main/java/org/apache/sling/tenant/spi/TenantManagerHook.java
@@ -21,8 +21,7 @@ package org.apache.sling.tenant.spi;
import java.util.Map;
import org.apache.sling.tenant.Tenant;
-
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* This is a service interface to customize tenant setup and administration.
diff --git a/src/main/java/org/apache/sling/tenant/spi/package-info.java b/src/main/java/org/apache/sling/tenant/spi/package-info.java
index aa5c3f6..a42ece2 100644
--- a/src/main/java/org/apache/sling/tenant/spi/package-info.java
+++ b/src/main/java/org/apache/sling/tenant/spi/package-info.java
@@ -17,8 +17,7 @@
* under the License.
*/
-@Version("1.1")
+@Version("1.1.1")
package org.apache.sling.tenant.spi;
-import aQute.bnd.annotation.Version;
-
+import org.osgi.annotation.versioning.Version;
[sling-org-apache-sling-tenant] 01/03: update to sling parent 34
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-tenant.git
commit fb87d750bb1452427aa64db025def5538d2a3f20
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Sun Sep 2 22:17:33 2018 +0200
update to sling parent 34
---
pom.xml | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index c5bdb4c..2d459b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>34</version>
<relativePath />
</parent>
@@ -44,10 +44,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
<executions>
@@ -72,6 +68,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
+ <version>1.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
@@ -106,14 +103,15 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bndlib</artifactId>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>biz.aQute.bndlib</artifactId>
+ <version>3.3.0</version>
<scope>provided</scope>
</dependency>
<!-- Webconsole -->
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
</dependency>
<!-- Testing -->