Author: olli
Date: Mon Mar 6 19:11:05 2017
New Revision: 1785736
URL: http://svn.apache.org/viewvc?rev=1785736&view=rev
Log:
use OSGi annotations and remove unused Maven SCR Plugin
Modified:
sling/trunk/testing/http/clients/pom.xml
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/html/package-info.java
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/instance/package-info.java
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/interceptors/package-info.java
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/osgi/package-info.java
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/package-info.java
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/config/impl/package-info.java
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/config/package-info.java
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/package-info.java
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/poller/package-info.java
Modified: sling/trunk/testing/http/clients/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/http/clients/pom.xml?rev=1785736&r1=1785735&r2=1785736&view=diff
==============================================================================
--- sling/trunk/testing/http/clients/pom.xml (original)
+++ sling/trunk/testing/http/clients/pom.xml Mon Mar 6 19:11:05 2017
@@ -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>
Modified:
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/html/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/html/package-info.java?rev=1785736&r1=1785735&r2=1785736&view=diff
==============================================================================
---
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/html/package-info.java
(original)
+++
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/html/package-info.java
Mon Mar 6 19:11:05 2017
@@ -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;
Modified:
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/instance/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/instance/package-info.java?rev=1785736&r1=1785735&r2=1785736&view=diff
==============================================================================
---
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/instance/package-info.java
(original)
+++
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/instance/package-info.java
Mon Mar 6 19:11:05 2017
@@ -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;
Modified:
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/interceptors/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/interceptors/package-info.java?rev=1785736&r1=1785735&r2=1785736&view=diff
==============================================================================
---
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/interceptors/package-info.java
(original)
+++
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/interceptors/package-info.java
Mon Mar 6 19:11:05 2017
@@ -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;
Modified:
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/osgi/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/osgi/package-info.java?rev=1785736&r1=1785735&r2=1785736&view=diff
==============================================================================
---
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/osgi/package-info.java
(original)
+++
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/osgi/package-info.java
Mon Mar 6 19:11:05 2017
@@ -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;
Modified:
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/package-info.java?rev=1785736&r1=1785735&r2=1785736&view=diff
==============================================================================
---
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/package-info.java
(original)
+++
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/package-info.java
Mon Mar 6 19:11:05 2017
@@ -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;
Modified:
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/config/impl/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/config/impl/package-info.java?rev=1785736&r1=1785735&r2=1785736&view=diff
==============================================================================
---
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/config/impl/package-info.java
(original)
+++
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/config/impl/package-info.java
Mon Mar 6 19:11:05 2017
@@ -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;
Modified:
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/config/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/config/package-info.java?rev=1785736&r1=1785735&r2=1785736&view=diff
==============================================================================
---
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/config/package-info.java
(original)
+++
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/config/package-info.java
Mon Mar 6 19:11:05 2017
@@ -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;
Modified:
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/package-info.java?rev=1785736&r1=1785735&r2=1785736&view=diff
==============================================================================
---
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/package-info.java
(original)
+++
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/package-info.java
Mon Mar 6 19:11:05 2017
@@ -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;
Modified:
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/poller/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/poller/package-info.java?rev=1785736&r1=1785735&r2=1785736&view=diff
==============================================================================
---
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/poller/package-info.java
(original)
+++
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/poller/package-info.java
Mon Mar 6 19:11:05 2017
@@ -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;
