Author: sseifert
Date: Mon Mar 6 15:50:05 2017
New Revision: 1785674
URL: http://svn.apache.org/viewvc?rev=1785674&view=rev
Log:
fix compile errors after switchting to parent 30:
- add scr annotation dependency where appropiate or remove maven-scr-plugin
- switch to osgi versioning annotations
Modified:
sling/trunk/testing/mocks/jcr-mock/pom.xml
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockQuery.java
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockQueryResult.java
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockQueryResultHandler.java
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/package-info.java
sling/trunk/testing/mocks/logging-mock/pom.xml
sling/trunk/testing/mocks/osgi-mock/pom.xml
sling/trunk/testing/mocks/sling-mock-oak/pom.xml
sling/trunk/testing/mocks/sling-mock/pom.xml
Modified: sling/trunk/testing/mocks/jcr-mock/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/pom.xml?rev=1785674&r1=1785673&r2=1785674&view=diff
==============================================================================
--- sling/trunk/testing/mocks/jcr-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/jcr-mock/pom.xml Mon Mar 6 15:50:05 2017
@@ -98,19 +98,6 @@
<extensions>true</extensions>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-scr-scrdescriptor</id>
- <goals>
- <goal>scr</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
</plugins>
</build>
Modified:
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java?rev=1785674&r1=1785673&r2=1785674&view=diff
==============================================================================
---
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java
(original)
+++
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java
Mon Mar 6 15:50:05 2017
@@ -28,8 +28,7 @@ import javax.jcr.SimpleCredentials;
import javax.jcr.query.QueryManager;
import org.apache.commons.lang3.StringUtils;
-
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Factory for mock JCR objects.
Modified:
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockQuery.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockQuery.java?rev=1785674&r1=1785673&r2=1785674&view=diff
==============================================================================
---
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockQuery.java
(original)
+++
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockQuery.java
Mon Mar 6 15:50:05 2017
@@ -28,7 +28,7 @@ import javax.jcr.Value;
import javax.jcr.query.Query;
import javax.jcr.query.QueryResult;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
import com.google.common.collect.ImmutableMap;
Modified:
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockQueryResult.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockQueryResult.java?rev=1785674&r1=1785673&r2=1785674&view=diff
==============================================================================
---
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockQueryResult.java
(original)
+++
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockQueryResult.java
Mon Mar 6 15:50:05 2017
@@ -29,8 +29,7 @@ import javax.jcr.query.RowIterator;
import org.apache.jackrabbit.commons.iterator.NodeIteratorAdapter;
import org.apache.jackrabbit.commons.iterator.RowIteratorAdapter;
-
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
Modified:
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockQueryResultHandler.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockQueryResultHandler.java?rev=1785674&r1=1785673&r2=1785674&view=diff
==============================================================================
---
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockQueryResultHandler.java
(original)
+++
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockQueryResultHandler.java
Mon Mar 6 15:50:05 2017
@@ -18,7 +18,7 @@
*/
package org.apache.sling.testing.mock.jcr;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Allows to set mocked query results for a mocked {@link
javax.jcr.query.QueryManager}.
Modified:
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/package-info.java?rev=1785674&r1=1785673&r2=1785674&view=diff
==============================================================================
---
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/package-info.java
(original)
+++
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/package-info.java
Mon Mar 6 15:50:05 2017
@@ -19,5 +19,5 @@
/**
* Mock implementation of selected JCR APIs.
*/
[email protected]("1.0")
[email protected]("1.0.1")
package org.apache.sling.testing.mock.jcr;
Modified: sling/trunk/testing/mocks/logging-mock/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/logging-mock/pom.xml?rev=1785674&r1=1785673&r2=1785674&view=diff
==============================================================================
--- sling/trunk/testing/mocks/logging-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/logging-mock/pom.xml Mon Mar 6 15:50:05 2017
@@ -58,11 +58,6 @@
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
</plugin>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
</plugins>
</build>
Modified: sling/trunk/testing/mocks/osgi-mock/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/pom.xml?rev=1785674&r1=1785673&r2=1785674&view=diff
==============================================================================
--- sling/trunk/testing/mocks/osgi-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/osgi-mock/pom.xml Mon Mar 6 15:50:05 2017
@@ -43,6 +43,12 @@
<dependencies>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
<scope>compile</scope>
Modified: sling/trunk/testing/mocks/sling-mock-oak/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock-oak/pom.xml?rev=1785674&r1=1785673&r2=1785674&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock-oak/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock-oak/pom.xml Mon Mar 6 15:50:05 2017
@@ -49,6 +49,12 @@
<dependencies>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
<version>${sling-mock.version}</version>
Modified: sling/trunk/testing/mocks/sling-mock/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1785674&r1=1785673&r2=1785674&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock/pom.xml Mon Mar 6 15:50:05 2017
@@ -43,6 +43,12 @@
<dependencies>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock</artifactId>
<version>2.2.3-SNAPSHOT</version>
