You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2019/06/26 13:09:48 UTC
[sling-org-apache-sling-models-api] 01/01: SLING-8452 migrate to
OSGi annotations
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/osgi-annotations
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git
commit 12412c488154fbb7a15f37eb3e86a786fa9e5c2e
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Wed Jun 26 15:09:15 2019 +0200
SLING-8452 migrate to OSGi annotations
upgrade to newest parent which forces us to require Java 8
---
bnd.bnd | 4 +++
pom.xml | 39 +++++++---------------
.../annotations/injectorspecific/package-info.java | 2 +-
.../sling/models/annotations/package-info.java | 2 +-
.../sling/models/annotations/via/package-info.java | 2 +-
.../sling/models/export/spi/ModelExporter.java | 6 ++--
.../sling/models/export/spi/package-info.java | 4 +--
.../sling/models/factory/ExportException.java | 2 +-
.../models/factory/InvalidAdaptableException.java | 2 +-
.../models/factory/InvalidModelException.java | 2 +-
.../models/factory/MissingElementException.java | 2 +-
.../models/factory/MissingElementsException.java | 2 +-
.../models/factory/MissingExporterException.java | 2 +-
.../sling/models/factory/ModelClassException.java | 2 +-
.../apache/sling/models/factory/ModelFactory.java | 7 ++--
.../models/factory/PostConstructException.java | 2 +-
.../sling/models/factory/ValidationException.java | 2 +-
.../apache/sling/models/factory/package-info.java | 4 +--
.../apache/sling/models/spi/AcceptsNullName.java | 2 +-
.../apache/sling/models/spi/DisposalCallback.java | 2 +-
.../sling/models/spi/DisposalCallbackRegistry.java | 3 +-
.../sling/models/spi/ImplementationPicker.java | 3 +-
.../java/org/apache/sling/models/spi/Injector.java | 3 +-
.../apache/sling/models/spi/ModelValidation.java | 3 +-
.../org/apache/sling/models/spi/ValuePreparer.java | 3 +-
.../AbstractInjectAnnotationProcessor.java | 2 +-
.../AbstractInjectAnnotationProcessor2.java | 3 +-
.../InjectAnnotationProcessor.java | 2 +-
.../InjectAnnotationProcessor2.java | 3 +-
.../InjectAnnotationProcessorFactory.java | 2 +-
.../InjectAnnotationProcessorFactory2.java | 2 +-
.../StaticInjectAnnotationProcessorFactory.java | 2 +-
.../models/spi/injectorspecific/package-info.java | 4 +--
.../org/apache/sling/models/spi/package-info.java | 4 +--
34 files changed, 56 insertions(+), 75 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..80f6ae3
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,4 @@
+Export-Package: org.apache.sling.models.*
+DynamicImport-Package: org.apache.sling.validation.api.*
+# Overwrite bundle description due to https://github.com/bndtools/bnd/issues/3282
+Bundle-Description: Apache Sling Models API
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 19bf7f3..9fd4503 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,13 +21,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>26</version>
- <relativePath />
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>36-SNAPSHOT</version>
+ <relativePath/>
</parent>
<artifactId>org.apache.sling.models.api</artifactId>
- <packaging>bundle</packaging>
<version>1.3.9-SNAPSHOT</version>
<name>Apache Sling Models API</name>
<description>Apache Sling Models API</description>
@@ -35,33 +34,18 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-models-api.git</url>
- <tag>HEAD</tag>
- </scm>
+ <tag>HEAD</tag>
+ </scm>
<properties>
- <sling.java.version>7</sling.java.version>
+ <sling.java.version>8</sling.java.version>
</properties>
- <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>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>org.apache.sling.models.*</Export-Package>
- <DynamicImport-Package>org.apache.sling.validation.api.*</DynamicImport-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
@@ -70,7 +54,6 @@
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
- <version>16.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -82,6 +65,8 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <version>2.4</version><!-- still Servlet 2.4 -->
+ <scope>provided</scope>
</dependency>
<!-- testing dependencies -->
<dependency>
diff --git a/src/main/java/org/apache/sling/models/annotations/injectorspecific/package-info.java b/src/main/java/org/apache/sling/models/annotations/injectorspecific/package-info.java
index 0a3ed08..111e589 100644
--- a/src/main/java/org/apache/sling/models/annotations/injectorspecific/package-info.java
+++ b/src/main/java/org/apache/sling/models/annotations/injectorspecific/package-info.java
@@ -17,4 +17,4 @@
@Version("1.1.0")
package org.apache.sling.models.annotations.injectorspecific;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/models/annotations/package-info.java b/src/main/java/org/apache/sling/models/annotations/package-info.java
index fdb8ffe..4236662 100644
--- a/src/main/java/org/apache/sling/models/annotations/package-info.java
+++ b/src/main/java/org/apache/sling/models/annotations/package-info.java
@@ -17,4 +17,4 @@
@Version("1.5.0")
package org.apache.sling.models.annotations;
-import aQute.bnd.annotation.Version;
\ No newline at end of file
+import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/models/annotations/via/package-info.java b/src/main/java/org/apache/sling/models/annotations/via/package-info.java
index 8453287..8b7ea8a 100644
--- a/src/main/java/org/apache/sling/models/annotations/via/package-info.java
+++ b/src/main/java/org/apache/sling/models/annotations/via/package-info.java
@@ -17,4 +17,4 @@
@Version("1.0.0")
package org.apache.sling.models.annotations.via;
-import aQute.bnd.annotation.Version;
\ No newline at end of file
+import org.osgi.annotation.versioning.Version;
\ No newline at end of file
diff --git a/src/main/java/org/apache/sling/models/export/spi/ModelExporter.java b/src/main/java/org/apache/sling/models/export/spi/ModelExporter.java
index c828b99..5654a82 100644
--- a/src/main/java/org/apache/sling/models/export/spi/ModelExporter.java
+++ b/src/main/java/org/apache/sling/models/export/spi/ModelExporter.java
@@ -16,12 +16,12 @@
*/
package org.apache.sling.models.export.spi;
-import aQute.bnd.annotation.ConsumerType;
+import java.util.Map;
+
import org.apache.sling.models.factory.ExportException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-
-import java.util.Map;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* SPI interface for model exporters.
*/
diff --git a/src/main/java/org/apache/sling/models/export/spi/package-info.java b/src/main/java/org/apache/sling/models/export/spi/package-info.java
index 1a8bcd5..0e1c151 100644
--- a/src/main/java/org/apache/sling/models/export/spi/package-info.java
+++ b/src/main/java/org/apache/sling/models/export/spi/package-info.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-@Version("1.0.1")
+@Version("1.0.2")
package org.apache.sling.models.export.spi;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/models/factory/ExportException.java b/src/main/java/org/apache/sling/models/factory/ExportException.java
index 1d71bb2..412d5d0 100644
--- a/src/main/java/org/apache/sling/models/factory/ExportException.java
+++ b/src/main/java/org/apache/sling/models/factory/ExportException.java
@@ -16,7 +16,7 @@
*/
package org.apache.sling.models.factory;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
@ProviderType
@SuppressWarnings("serial")
diff --git a/src/main/java/org/apache/sling/models/factory/InvalidAdaptableException.java b/src/main/java/org/apache/sling/models/factory/InvalidAdaptableException.java
index 0f04bd3..813f73c 100644
--- a/src/main/java/org/apache/sling/models/factory/InvalidAdaptableException.java
+++ b/src/main/java/org/apache/sling/models/factory/InvalidAdaptableException.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.models.factory;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Exception which is triggered whenever a Sling Model could not be
diff --git a/src/main/java/org/apache/sling/models/factory/InvalidModelException.java b/src/main/java/org/apache/sling/models/factory/InvalidModelException.java
index 2b9b3ca..7cfc5fc 100644
--- a/src/main/java/org/apache/sling/models/factory/InvalidModelException.java
+++ b/src/main/java/org/apache/sling/models/factory/InvalidModelException.java
@@ -16,7 +16,7 @@
*/
package org.apache.sling.models.factory;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Thrown in case the given model type could not be validated through the model validation.
diff --git a/src/main/java/org/apache/sling/models/factory/MissingElementException.java b/src/main/java/org/apache/sling/models/factory/MissingElementException.java
index 76f7683..1a38b70 100644
--- a/src/main/java/org/apache/sling/models/factory/MissingElementException.java
+++ b/src/main/java/org/apache/sling/models/factory/MissingElementException.java
@@ -20,7 +20,7 @@ package org.apache.sling.models.factory;
import java.lang.reflect.AnnotatedElement;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Exception which is used whenever one element (field, method or constructor) could not be set.
diff --git a/src/main/java/org/apache/sling/models/factory/MissingElementsException.java b/src/main/java/org/apache/sling/models/factory/MissingElementsException.java
index fe712e8..1dd875f 100644
--- a/src/main/java/org/apache/sling/models/factory/MissingElementsException.java
+++ b/src/main/java/org/apache/sling/models/factory/MissingElementsException.java
@@ -21,7 +21,7 @@ package org.apache.sling.models.factory;
import java.util.ArrayList;
import java.util.Collection;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Exception which is triggered whenever a Sling Model cannot be instantiated
diff --git a/src/main/java/org/apache/sling/models/factory/MissingExporterException.java b/src/main/java/org/apache/sling/models/factory/MissingExporterException.java
index 1cb7717..b58b6d3 100644
--- a/src/main/java/org/apache/sling/models/factory/MissingExporterException.java
+++ b/src/main/java/org/apache/sling/models/factory/MissingExporterException.java
@@ -16,7 +16,7 @@
*/
package org.apache.sling.models.factory;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
@ProviderType
@SuppressWarnings("serial")
diff --git a/src/main/java/org/apache/sling/models/factory/ModelClassException.java b/src/main/java/org/apache/sling/models/factory/ModelClassException.java
index 0b1cb6a..d9d7172 100644
--- a/src/main/java/org/apache/sling/models/factory/ModelClassException.java
+++ b/src/main/java/org/apache/sling/models/factory/ModelClassException.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.models.factory;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Exception which is triggered when the Model class could not be instantiated due to
diff --git a/src/main/java/org/apache/sling/models/factory/ModelFactory.java b/src/main/java/org/apache/sling/models/factory/ModelFactory.java
index 5055429..b27ef53 100644
--- a/src/main/java/org/apache/sling/models/factory/ModelFactory.java
+++ b/src/main/java/org/apache/sling/models/factory/ModelFactory.java
@@ -18,14 +18,13 @@
*/
package org.apache.sling.models.factory;
+import java.util.Map;
+
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.resource.Resource;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-
-import aQute.bnd.annotation.ProviderType;
-
-import java.util.Map;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The ModelFactory instantiates Sling Model classes similar to #adaptTo but will throw an exception in case
diff --git a/src/main/java/org/apache/sling/models/factory/PostConstructException.java b/src/main/java/org/apache/sling/models/factory/PostConstructException.java
index 7fac494..f16ddec 100644
--- a/src/main/java/org/apache/sling/models/factory/PostConstructException.java
+++ b/src/main/java/org/apache/sling/models/factory/PostConstructException.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.models.factory;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Exception which is triggered, whenever the post-construct method has thrown an exception.
diff --git a/src/main/java/org/apache/sling/models/factory/ValidationException.java b/src/main/java/org/apache/sling/models/factory/ValidationException.java
index d0c2767..8a7f0fd 100644
--- a/src/main/java/org/apache/sling/models/factory/ValidationException.java
+++ b/src/main/java/org/apache/sling/models/factory/ValidationException.java
@@ -16,7 +16,7 @@
*/
package org.apache.sling.models.factory;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Thrown in case an validation could not be performed for the given model.
diff --git a/src/main/java/org/apache/sling/models/factory/package-info.java b/src/main/java/org/apache/sling/models/factory/package-info.java
index 67bd42f..6a0a9e5 100644
--- a/src/main/java/org/apache/sling/models/factory/package-info.java
+++ b/src/main/java/org/apache/sling/models/factory/package-info.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.4.1")
+@Version("1.4.2")
package org.apache.sling.models.factory;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/models/spi/AcceptsNullName.java b/src/main/java/org/apache/sling/models/spi/AcceptsNullName.java
index aa20d8f..5ca2a2d 100644
--- a/src/main/java/org/apache/sling/models/spi/AcceptsNullName.java
+++ b/src/main/java/org/apache/sling/models/spi/AcceptsNullName.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.models.spi;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Marker interface for an injector to declare that it ignores the name
diff --git a/src/main/java/org/apache/sling/models/spi/DisposalCallback.java b/src/main/java/org/apache/sling/models/spi/DisposalCallback.java
index bda096b..42db8c9 100644
--- a/src/main/java/org/apache/sling/models/spi/DisposalCallback.java
+++ b/src/main/java/org/apache/sling/models/spi/DisposalCallback.java
@@ -16,7 +16,7 @@
*/
package org.apache.sling.models.spi;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Callback interface which can be implemented by Injectors to perform some action
diff --git a/src/main/java/org/apache/sling/models/spi/DisposalCallbackRegistry.java b/src/main/java/org/apache/sling/models/spi/DisposalCallbackRegistry.java
index b3bc9c0..84025d0 100644
--- a/src/main/java/org/apache/sling/models/spi/DisposalCallbackRegistry.java
+++ b/src/main/java/org/apache/sling/models/spi/DisposalCallbackRegistry.java
@@ -16,9 +16,8 @@
*/
package org.apache.sling.models.spi;
-import aQute.bnd.annotation.ConsumerType;
-
import org.jetbrains.annotations.NotNull;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Interface which allows for the registration of DisposalCallback listeners.
diff --git a/src/main/java/org/apache/sling/models/spi/ImplementationPicker.java b/src/main/java/org/apache/sling/models/spi/ImplementationPicker.java
index cdc2907..115d3b0 100644
--- a/src/main/java/org/apache/sling/models/spi/ImplementationPicker.java
+++ b/src/main/java/org/apache/sling/models/spi/ImplementationPicker.java
@@ -18,10 +18,9 @@
*/
package org.apache.sling.models.spi;
-import aQute.bnd.annotation.ConsumerType;
-
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Defines a strategy to choose an implementation for a model if multiple are registered
diff --git a/src/main/java/org/apache/sling/models/spi/Injector.java b/src/main/java/org/apache/sling/models/spi/Injector.java
index e76f2e3..7483252 100644
--- a/src/main/java/org/apache/sling/models/spi/Injector.java
+++ b/src/main/java/org/apache/sling/models/spi/Injector.java
@@ -19,10 +19,9 @@ package org.apache.sling.models.spi;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Type;
-import aQute.bnd.annotation.ConsumerType;
-
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Service interface for pluggable value injectors.
diff --git a/src/main/java/org/apache/sling/models/spi/ModelValidation.java b/src/main/java/org/apache/sling/models/spi/ModelValidation.java
index d47a1b1..01b4124 100644
--- a/src/main/java/org/apache/sling/models/spi/ModelValidation.java
+++ b/src/main/java/org/apache/sling/models/spi/ModelValidation.java
@@ -18,8 +18,7 @@ package org.apache.sling.models.spi;
import org.apache.sling.models.factory.InvalidModelException;
import org.apache.sling.models.factory.ValidationException;
-
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
@ConsumerType
public interface ModelValidation {
diff --git a/src/main/java/org/apache/sling/models/spi/ValuePreparer.java b/src/main/java/org/apache/sling/models/spi/ValuePreparer.java
index bd3bb36..e12a392 100644
--- a/src/main/java/org/apache/sling/models/spi/ValuePreparer.java
+++ b/src/main/java/org/apache/sling/models/spi/ValuePreparer.java
@@ -16,9 +16,8 @@
*/
package org.apache.sling.models.spi;
-import aQute.bnd.annotation.ConsumerType;
-
import org.jetbrains.annotations.NotNull;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Optimization interface for Injectors which wish to avoid repeated accessing of some object
diff --git a/src/main/java/org/apache/sling/models/spi/injectorspecific/AbstractInjectAnnotationProcessor.java b/src/main/java/org/apache/sling/models/spi/injectorspecific/AbstractInjectAnnotationProcessor.java
index b681af8..f1c3bc7 100644
--- a/src/main/java/org/apache/sling/models/spi/injectorspecific/AbstractInjectAnnotationProcessor.java
+++ b/src/main/java/org/apache/sling/models/spi/injectorspecific/AbstractInjectAnnotationProcessor.java
@@ -16,7 +16,7 @@
*/
package org.apache.sling.models.spi.injectorspecific;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Default implementation of {@link InjectAnnotationProcessor}.
diff --git a/src/main/java/org/apache/sling/models/spi/injectorspecific/AbstractInjectAnnotationProcessor2.java b/src/main/java/org/apache/sling/models/spi/injectorspecific/AbstractInjectAnnotationProcessor2.java
index 6fbefe9..a96bfe7 100644
--- a/src/main/java/org/apache/sling/models/spi/injectorspecific/AbstractInjectAnnotationProcessor2.java
+++ b/src/main/java/org/apache/sling/models/spi/injectorspecific/AbstractInjectAnnotationProcessor2.java
@@ -17,8 +17,7 @@
package org.apache.sling.models.spi.injectorspecific;
import org.apache.sling.models.annotations.injectorspecific.InjectionStrategy;
-
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Default implementation of {@link InjectAnnotationProcessor2}.
diff --git a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessor.java b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessor.java
index e2c0912..0fa4d88 100644
--- a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessor.java
+++ b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessor.java
@@ -16,7 +16,7 @@
*/
package org.apache.sling.models.spi.injectorspecific;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Processor for injector-specific annotations.
diff --git a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessor2.java b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessor2.java
index dddb0a6..886a8af 100644
--- a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessor2.java
+++ b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessor2.java
@@ -17,8 +17,7 @@
package org.apache.sling.models.spi.injectorspecific;
import org.apache.sling.models.annotations.injectorspecific.InjectionStrategy;
-
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Processor for injector-specific annotations.
diff --git a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessorFactory.java b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessorFactory.java
index 2c431bf..b3cd3d8 100644
--- a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessorFactory.java
+++ b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessorFactory.java
@@ -18,7 +18,7 @@ package org.apache.sling.models.spi.injectorspecific;
import java.lang.reflect.AnnotatedElement;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Factory for {@link InjectAnnotationProcessor} that is evaluated at runtime for each
diff --git a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessorFactory2.java b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessorFactory2.java
index 3465e4f..772a2b6 100644
--- a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessorFactory2.java
+++ b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessorFactory2.java
@@ -18,7 +18,7 @@ package org.apache.sling.models.spi.injectorspecific;
import java.lang.reflect.AnnotatedElement;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Factory for {@link InjectAnnotationProcessor2} that is evaluated at runtime for each
diff --git a/src/main/java/org/apache/sling/models/spi/injectorspecific/StaticInjectAnnotationProcessorFactory.java b/src/main/java/org/apache/sling/models/spi/injectorspecific/StaticInjectAnnotationProcessorFactory.java
index b8f55f3..a78ba73 100644
--- a/src/main/java/org/apache/sling/models/spi/injectorspecific/StaticInjectAnnotationProcessorFactory.java
+++ b/src/main/java/org/apache/sling/models/spi/injectorspecific/StaticInjectAnnotationProcessorFactory.java
@@ -18,7 +18,7 @@ package org.apache.sling.models.spi.injectorspecific;
import java.lang.reflect.AnnotatedElement;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* Factory for {@link InjectAnnotationProcessor} that is evaluated once
diff --git a/src/main/java/org/apache/sling/models/spi/injectorspecific/package-info.java b/src/main/java/org/apache/sling/models/spi/injectorspecific/package-info.java
index c75ec3a..1f29089 100644
--- a/src/main/java/org/apache/sling/models/spi/injectorspecific/package-info.java
+++ b/src/main/java/org/apache/sling/models/spi/injectorspecific/package-info.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.1.1")
+@Version("1.1.2")
package org.apache.sling.models.spi.injectorspecific;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/models/spi/package-info.java b/src/main/java/org/apache/sling/models/spi/package-info.java
index 54c57ce..1aeb724 100644
--- a/src/main/java/org/apache/sling/models/spi/package-info.java
+++ b/src/main/java/org/apache/sling/models/spi/package-info.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.2.1")
+@Version("1.2.2")
package org.apache.sling.models.spi;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;