This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.testing.clients-1.1.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-clients.git
commit 7d6589d2c8d2608f5c1515baa1e263539b8e97d6 Author: Oliver Lietz <[email protected]> AuthorDate: Mon Mar 6 19:11:05 2017 +0000 use OSGi annotations and remove unused Maven SCR Plugin git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/http/clients@1785736 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 4 ---- src/main/java/org/apache/sling/testing/clients/html/package-info.java | 3 +-- .../java/org/apache/sling/testing/clients/instance/package-info.java | 3 +-- .../org/apache/sling/testing/clients/interceptors/package-info.java | 3 +-- src/main/java/org/apache/sling/testing/clients/osgi/package-info.java | 4 +++- src/main/java/org/apache/sling/testing/clients/package-info.java | 3 +-- .../apache/sling/testing/clients/util/config/impl/package-info.java | 3 +-- .../org/apache/sling/testing/clients/util/config/package-info.java | 3 +-- src/main/java/org/apache/sling/testing/clients/util/package-info.java | 3 +-- .../org/apache/sling/testing/clients/util/poller/package-info.java | 3 +-- 10 files changed, 11 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index af7f357..ff471a4 100644 --- a/pom.xml +++ b/pom.xml @@ -43,10 +43,6 @@ <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> diff --git a/src/main/java/org/apache/sling/testing/clients/html/package-info.java b/src/main/java/org/apache/sling/testing/clients/html/package-info.java index 97b22cb..5f5a9f5 100644 --- a/src/main/java/org/apache/sling/testing/clients/html/package-info.java +++ b/src/main/java/org/apache/sling/testing/clients/html/package-info.java @@ -20,5 +20,4 @@ @Version("2.1.0") package org.apache.sling.testing.clients.html; -import aQute.bnd.annotation.Version; - +import org.osgi.annotation.versioning.Version; diff --git a/src/main/java/org/apache/sling/testing/clients/instance/package-info.java b/src/main/java/org/apache/sling/testing/clients/instance/package-info.java index 43010e9..4d8063e 100644 --- a/src/main/java/org/apache/sling/testing/clients/instance/package-info.java +++ b/src/main/java/org/apache/sling/testing/clients/instance/package-info.java @@ -20,5 +20,4 @@ @Version("1.1.0") package org.apache.sling.testing.clients.instance; -import aQute.bnd.annotation.Version; - +import org.osgi.annotation.versioning.Version; diff --git a/src/main/java/org/apache/sling/testing/clients/interceptors/package-info.java b/src/main/java/org/apache/sling/testing/clients/interceptors/package-info.java index 49e7065..0f097b5 100644 --- a/src/main/java/org/apache/sling/testing/clients/interceptors/package-info.java +++ b/src/main/java/org/apache/sling/testing/clients/interceptors/package-info.java @@ -20,5 +20,4 @@ @Version("1.0.1") package org.apache.sling.testing.clients.interceptors; -import aQute.bnd.annotation.Version; - +import org.osgi.annotation.versioning.Version; diff --git a/src/main/java/org/apache/sling/testing/clients/osgi/package-info.java b/src/main/java/org/apache/sling/testing/clients/osgi/package-info.java index 3a2f85e..119cb90 100644 --- a/src/main/java/org/apache/sling/testing/clients/osgi/package-info.java +++ b/src/main/java/org/apache/sling/testing/clients/osgi/package-info.java @@ -19,5 +19,7 @@ /** * OSGI testing tools. */ [email protected]("1.1.0") +@Version("1.1.0") package org.apache.sling.testing.clients.osgi; + +import org.osgi.annotation.versioning.Version; diff --git a/src/main/java/org/apache/sling/testing/clients/package-info.java b/src/main/java/org/apache/sling/testing/clients/package-info.java index d9cf961..c7b45c6 100644 --- a/src/main/java/org/apache/sling/testing/clients/package-info.java +++ b/src/main/java/org/apache/sling/testing/clients/package-info.java @@ -20,5 +20,4 @@ @Version("1.2.0") package org.apache.sling.testing.clients; -import aQute.bnd.annotation.Version; - +import org.osgi.annotation.versioning.Version; diff --git a/src/main/java/org/apache/sling/testing/clients/util/config/impl/package-info.java b/src/main/java/org/apache/sling/testing/clients/util/config/impl/package-info.java index d6bfe66..e085e7e 100644 --- a/src/main/java/org/apache/sling/testing/clients/util/config/impl/package-info.java +++ b/src/main/java/org/apache/sling/testing/clients/util/config/impl/package-info.java @@ -20,5 +20,4 @@ @Version("1.0.0") package org.apache.sling.testing.clients.util.config.impl; -import aQute.bnd.annotation.Version; - +import org.osgi.annotation.versioning.Version; diff --git a/src/main/java/org/apache/sling/testing/clients/util/config/package-info.java b/src/main/java/org/apache/sling/testing/clients/util/config/package-info.java index 59d0aaa..025052b 100644 --- a/src/main/java/org/apache/sling/testing/clients/util/config/package-info.java +++ b/src/main/java/org/apache/sling/testing/clients/util/config/package-info.java @@ -20,5 +20,4 @@ @Version("1.0.0") package org.apache.sling.testing.clients.util.config; -import aQute.bnd.annotation.Version; - +import org.osgi.annotation.versioning.Version; diff --git a/src/main/java/org/apache/sling/testing/clients/util/package-info.java b/src/main/java/org/apache/sling/testing/clients/util/package-info.java index 048ebae..7d4ac3b 100644 --- a/src/main/java/org/apache/sling/testing/clients/util/package-info.java +++ b/src/main/java/org/apache/sling/testing/clients/util/package-info.java @@ -20,5 +20,4 @@ @Version("1.0.0") package org.apache.sling.testing.clients.util; -import aQute.bnd.annotation.Version; - +import org.osgi.annotation.versioning.Version; diff --git a/src/main/java/org/apache/sling/testing/clients/util/poller/package-info.java b/src/main/java/org/apache/sling/testing/clients/util/poller/package-info.java index 6367401..4ff5bb0 100644 --- a/src/main/java/org/apache/sling/testing/clients/util/poller/package-info.java +++ b/src/main/java/org/apache/sling/testing/clients/util/poller/package-info.java @@ -20,5 +20,4 @@ @Version("1.0.0") package org.apache.sling.testing.clients.util.poller; -import aQute.bnd.annotation.Version; - +import org.osgi.annotation.versioning.Version; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
