sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From romb...@apache.org
Subject [sling-org-apache-sling-testing-jcr-mock] 03/07: fix compile errors after switchting to parent 30: - add scr annotation dependency where appropiate or remove maven-scr-plugin - switch to osgi versioning annotations
Date Tue, 07 Nov 2017 10:19:00 GMT
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.testing.jcr-mock-1.3.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-jcr-mock.git

commit 7cfb35cff3eaf37fcf2afd0f41fc626a19bfd1db
Author: Stefan Seifert <sseifert@apache.org>
AuthorDate: Mon Mar 6 15:50:05 2017 +0000

    fix compile errors after switchting to parent 30:
    - add scr annotation dependency where appropiate or remove maven-scr-plugin
    - switch to osgi versioning annotations
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/jcr-mock@1785674
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                                     | 13 -------------
 .../java/org/apache/sling/testing/mock/jcr/MockJcr.java     |  3 +--
 .../java/org/apache/sling/testing/mock/jcr/MockQuery.java   |  2 +-
 .../org/apache/sling/testing/mock/jcr/MockQueryResult.java  |  3 +--
 .../sling/testing/mock/jcr/MockQueryResultHandler.java      |  2 +-
 .../org/apache/sling/testing/mock/jcr/package-info.java     |  2 +-
 6 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index b44b6cc..27c3d11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
   
diff --git a/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java b/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java
index 0e54f25..31e581b 100644
--- a/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java
+++ b/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java
@@ -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.
diff --git a/src/main/java/org/apache/sling/testing/mock/jcr/MockQuery.java b/src/main/java/org/apache/sling/testing/mock/jcr/MockQuery.java
index e7f3ff8..0e56026 100644
--- a/src/main/java/org/apache/sling/testing/mock/jcr/MockQuery.java
+++ b/src/main/java/org/apache/sling/testing/mock/jcr/MockQuery.java
@@ -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;
 
diff --git a/src/main/java/org/apache/sling/testing/mock/jcr/MockQueryResult.java b/src/main/java/org/apache/sling/testing/mock/jcr/MockQueryResult.java
index 6d7d486..356d1da 100644
--- a/src/main/java/org/apache/sling/testing/mock/jcr/MockQueryResult.java
+++ b/src/main/java/org/apache/sling/testing/mock/jcr/MockQueryResult.java
@@ -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;
diff --git a/src/main/java/org/apache/sling/testing/mock/jcr/MockQueryResultHandler.java b/src/main/java/org/apache/sling/testing/mock/jcr/MockQueryResultHandler.java
index 7408565..40572a3 100644
--- a/src/main/java/org/apache/sling/testing/mock/jcr/MockQueryResultHandler.java
+++ b/src/main/java/org/apache/sling/testing/mock/jcr/MockQueryResultHandler.java
@@ -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}.
diff --git a/src/main/java/org/apache/sling/testing/mock/jcr/package-info.java b/src/main/java/org/apache/sling/testing/mock/jcr/package-info.java
index ef61470..b4794d7 100644
--- a/src/main/java/org/apache/sling/testing/mock/jcr/package-info.java
+++ b/src/main/java/org/apache/sling/testing/mock/jcr/package-info.java
@@ -19,5 +19,5 @@
 /**
  * Mock implementation of selected JCR APIs.
  */
-@aQute.bnd.annotation.Version("1.0")
+@org.osgi.annotation.versioning.Version("1.0.1")
 package org.apache.sling.testing.mock.jcr;

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.

Mime
View raw message