You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2016/11/09 09:02:31 UTC
svn commit: r1768881 - in /sling/trunk/bundles/jcr/api: ./
src/main/java/org/apache/sling/jcr/api/
Author: cziegeler
Date: Wed Nov 9 09:02:30 2016
New Revision: 1768881
URL: http://svn.apache.org/viewvc?rev=1768881&view=rev
Log:
Update to parent pom 29
Modified:
sling/trunk/bundles/jcr/api/pom.xml
sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/NamespaceMapper.java
sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepository.java
sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepositoryInitializer.java
sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/package-info.java
Modified: sling/trunk/bundles/jcr/api/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/api/pom.xml?rev=1768881&r1=1768880&r2=1768881&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/api/pom.xml (original)
+++ sling/trunk/bundles/jcr/api/pom.xml Wed Nov 9 09:02:30 2016
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>29</version>
<relativePath />
</parent>
@@ -65,12 +65,6 @@
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bndlib</artifactId>
- <scope>provided</scope>
</dependency>
</dependencies>
Modified: sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/NamespaceMapper.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/NamespaceMapper.java?rev=1768881&r1=1768880&r2=1768881&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/NamespaceMapper.java (original)
+++ sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/NamespaceMapper.java Wed Nov 9 09:02:30 2016
@@ -21,7 +21,7 @@ package org.apache.sling.jcr.api;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* This interface is used to customize the namespace mapping of
Modified: sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepository.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepository.java?rev=1768881&r1=1768880&r2=1768881&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepository.java (original)
+++ sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepository.java Wed Nov 9 09:02:30 2016
@@ -24,7 +24,7 @@ import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The <code>SlingRepository</code> extends the standard JCR repository
Modified: sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepositoryInitializer.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepositoryInitializer.java?rev=1768881&r1=1768880&r2=1768881&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepositoryInitializer.java (original)
+++ sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepositoryInitializer.java Wed Nov 9 09:02:30 2016
@@ -18,21 +18,21 @@
*/
package org.apache.sling.jcr.api;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
- * All active <code>SlingRepositoryInitializer</code> services are called before
+ * All active <code>SlingRepositoryInitializer</code> services are called before
* making the <code>SlingRepository</code> service available, and can perform
* initializations on it, like creating service users, setting up initial access
* control, migrating content in upgrades, etc.
- *
+ *
* The <code>SlingRepositoryInitializer</code> services need to be aware of any
* repository clustering scenarios as well as multiple Sling instances accessing
- * the same repository. They might need to implement locking to avoid conflicts.
+ * the same repository. They might need to implement locking to avoid conflicts.
*/
@ConsumerType
public interface SlingRepositoryInitializer {
- /** Process the content repository before it is
+ /** Process the content repository before it is
* registered as an OSGi service.
* @param repo the repository to process
* @throws Exception If anything happens that should prevent
Modified: sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/package-info.java?rev=1768881&r1=1768880&r2=1768881&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/package-info.java (original)
+++ sling/trunk/bundles/jcr/api/src/main/java/org/apache/sling/jcr/api/package-info.java Wed Nov 9 09:02:30 2016
@@ -17,8 +17,8 @@
* under the License.
*/
-@Version("2.4.0")
+@Version("2.4.2")
package org.apache.sling.jcr.api;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;