Author: cziegeler
Date: Mon May 8 09:26:29 2017
New Revision: 1794298
URL: http://svn.apache.org/viewvc?rev=1794298&view=rev
Log:
Update to parent pom 30, official OSGi annotations
Modified:
sling/trunk/bundles/extensions/discovery/api/pom.xml
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/ClusterView.java
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/DiscoveryService.java
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/InstanceDescription.java
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/InstanceFilter.java
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/PropertyProvider.java
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/TopologyEventListener.java
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/TopologyView.java
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/package-info.java
Modified: sling/trunk/bundles/extensions/discovery/api/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api/pom.xml?rev=1794298&r1=1794297&r2=1794298&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/api/pom.xml (original)
+++ sling/trunk/bundles/extensions/discovery/api/pom.xml Mon May 8 09:26:29
2017
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>30</version>
<relativePath />
</parent>
@@ -51,10 +51,4 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bndlib</artifactId>
- </dependency>
- </dependencies>
</project>
Modified:
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/ClusterView.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/ClusterView.java?rev=1794298&r1=1794297&r2=1794298&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/ClusterView.java
(original)
+++
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/ClusterView.java
Mon May 8 09:26:29 2017
@@ -20,7 +20,8 @@ package org.apache.sling.discovery;
import java.util.List;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
+
/**
* A ClusterView represents the instances of a cluster that are
@@ -50,7 +51,7 @@ public interface ClusterView {
* <p>
* Note: When instances part from a cluster (eg due to a network
* partitioning) the cluster id is retained. This results in
- * potentially multiple clusters with the same id. This
+ * potentially multiple clusters with the same id. This
* fact could be used to detect such partitioning/split brain
* situations. It also implies though that the cluster id
* is not guaranteed to be unique in a topology!
Modified:
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/DiscoveryService.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/DiscoveryService.java?rev=1794298&r1=1794297&r2=1794298&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/DiscoveryService.java
(original)
+++
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/DiscoveryService.java
Mon May 8 09:26:29 2017
@@ -18,7 +18,7 @@
*/
package org.apache.sling.discovery;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The discovery service can be used to get the current topology view.
Modified:
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/InstanceDescription.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/InstanceDescription.java?rev=1794298&r1=1794297&r2=1794298&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/InstanceDescription.java
(original)
+++
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/InstanceDescription.java
Mon May 8 09:26:29 2017
@@ -20,7 +20,7 @@ package org.apache.sling.discovery;
import java.util.Map;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* An InstanceDescription represents and contains information about an
Modified:
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/InstanceFilter.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/InstanceFilter.java?rev=1794298&r1=1794297&r2=1794298&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/InstanceFilter.java
(original)
+++
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/InstanceFilter.java
Mon May 8 09:26:29 2017
@@ -18,7 +18,7 @@
*/
package org.apache.sling.discovery;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Used to filter InstanceDescriptions in a TopologyView.
Modified:
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/PropertyProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/PropertyProvider.java?rev=1794298&r1=1794297&r2=1794298&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/PropertyProvider.java
(original)
+++
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/PropertyProvider.java
Mon May 8 09:26:29 2017
@@ -18,8 +18,7 @@
*/
package org.apache.sling.discovery;
-import aQute.bnd.annotation.ConsumerType;
-
+import org.osgi.annotation.versioning.ConsumerType;
/**
* The <code>PropertyProvider</code> service interface may be implemented by
Modified:
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/TopologyEventListener.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/TopologyEventListener.java?rev=1794298&r1=1794297&r2=1794298&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/TopologyEventListener.java
(original)
+++
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/TopologyEventListener.java
Mon May 8 09:26:29 2017
@@ -18,7 +18,7 @@
*/
package org.apache.sling.discovery;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* The <code>TopologyEventListener</code> service interface may be implemented
by
Modified:
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/TopologyView.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/TopologyView.java?rev=1794298&r1=1794297&r2=1794298&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/TopologyView.java
(original)
+++
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/TopologyView.java
Mon May 8 09:26:29 2017
@@ -20,7 +20,7 @@ package org.apache.sling.discovery;
import java.util.Set;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* A topology view is a cross-cluster list of instances and clusters
Modified:
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/package-info.java?rev=1794298&r1=1794297&r2=1794298&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/package-info.java
(original)
+++
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/package-info.java
Mon May 8 09:26:29 2017
@@ -23,8 +23,7 @@
*
* @version 1.0
*/
-@Version("1.0.2")
[email protected]("1.0.3")
package org.apache.sling.discovery;
-import aQute.bnd.annotation.Version;
