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 2017/10/20 14:37:03 UTC
[sling-org-apache-sling-discovery-api] 38/39: Update to parent pom
30, official OSGi annotations
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-discovery-api.git
commit b9881ae9bad093c77cd173982abbcd30c7c20643
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon May 8 09:26:29 2017 +0000
Update to parent pom 30, official OSGi annotations
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1794298 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 +-------
src/main/java/org/apache/sling/discovery/ClusterView.java | 5 +++--
src/main/java/org/apache/sling/discovery/DiscoveryService.java | 2 +-
src/main/java/org/apache/sling/discovery/InstanceDescription.java | 2 +-
src/main/java/org/apache/sling/discovery/InstanceFilter.java | 2 +-
src/main/java/org/apache/sling/discovery/PropertyProvider.java | 3 +--
.../java/org/apache/sling/discovery/TopologyEventListener.java | 2 +-
src/main/java/org/apache/sling/discovery/TopologyView.java | 2 +-
src/main/java/org/apache/sling/discovery/package-info.java | 3 +--
9 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9000756..7d68497 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/main/java/org/apache/sling/discovery/ClusterView.java b/src/main/java/org/apache/sling/discovery/ClusterView.java
index 42f47a1..3fe4f57 100644
--- a/src/main/java/org/apache/sling/discovery/ClusterView.java
+++ b/src/main/java/org/apache/sling/discovery/ClusterView.java
@@ -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!
diff --git a/src/main/java/org/apache/sling/discovery/DiscoveryService.java b/src/main/java/org/apache/sling/discovery/DiscoveryService.java
index eebf0da..70f5a72 100644
--- a/src/main/java/org/apache/sling/discovery/DiscoveryService.java
+++ b/src/main/java/org/apache/sling/discovery/DiscoveryService.java
@@ -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.
diff --git a/src/main/java/org/apache/sling/discovery/InstanceDescription.java b/src/main/java/org/apache/sling/discovery/InstanceDescription.java
index 9cde2cf..e048368 100644
--- a/src/main/java/org/apache/sling/discovery/InstanceDescription.java
+++ b/src/main/java/org/apache/sling/discovery/InstanceDescription.java
@@ -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
diff --git a/src/main/java/org/apache/sling/discovery/InstanceFilter.java b/src/main/java/org/apache/sling/discovery/InstanceFilter.java
index f25b771..94d621a 100644
--- a/src/main/java/org/apache/sling/discovery/InstanceFilter.java
+++ b/src/main/java/org/apache/sling/discovery/InstanceFilter.java
@@ -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.
diff --git a/src/main/java/org/apache/sling/discovery/PropertyProvider.java b/src/main/java/org/apache/sling/discovery/PropertyProvider.java
index c4b292c..c6e15db 100644
--- a/src/main/java/org/apache/sling/discovery/PropertyProvider.java
+++ b/src/main/java/org/apache/sling/discovery/PropertyProvider.java
@@ -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
diff --git a/src/main/java/org/apache/sling/discovery/TopologyEventListener.java b/src/main/java/org/apache/sling/discovery/TopologyEventListener.java
index 71e1ff2..0188f5b 100644
--- a/src/main/java/org/apache/sling/discovery/TopologyEventListener.java
+++ b/src/main/java/org/apache/sling/discovery/TopologyEventListener.java
@@ -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
diff --git a/src/main/java/org/apache/sling/discovery/TopologyView.java b/src/main/java/org/apache/sling/discovery/TopologyView.java
index c1f3acb..1df2ce1 100644
--- a/src/main/java/org/apache/sling/discovery/TopologyView.java
+++ b/src/main/java/org/apache/sling/discovery/TopologyView.java
@@ -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
diff --git a/src/main/java/org/apache/sling/discovery/package-info.java b/src/main/java/org/apache/sling/discovery/package-info.java
index b7e26d4..8b2bfda 100644
--- a/src/main/java/org/apache/sling/discovery/package-info.java
+++ b/src/main/java/org/apache/sling/discovery/package-info.java
@@ -23,8 +23,7 @@
*
* @version 1.0
*/
-@Version("1.0.2")
+@org.osgi.annotation.versioning.Version("1.0.3")
package org.apache.sling.discovery;
-import aQute.bnd.annotation.Version;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.