You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2018/01/20 21:53:26 UTC
[sling-org-apache-sling-commons-contentdetection] 01/02: SLING-7353
Update to Sling Parent 33
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-contentdetection.git
commit ca214c1e9428fa34c590b13cadc0776783841f15
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jan 20 22:52:40 2018 +0100
SLING-7353 Update to Sling Parent 33
---
pom.xml | 27 +++++++++++-----------
.../commons/contentdetection/package-info.java | 5 +---
2 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index c8604db..abfe428 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>30</version>
+ <version>33</version>
<relativePath />
</parent>
@@ -57,23 +57,29 @@
<!-- OSGi -->
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>test</scope>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
- <scope>provided</scope>
+ <version>3.5.0</version>
+ <scope>test</scope>
</dependency>
<!-- Apache Commons -->
<dependency>
@@ -178,13 +184,6 @@
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>generate-depends-file</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
diff --git a/src/main/java/org/apache/sling/commons/contentdetection/package-info.java b/src/main/java/org/apache/sling/commons/contentdetection/package-info.java
index 0612384..e23e849 100644
--- a/src/main/java/org/apache/sling/commons/contentdetection/package-info.java
+++ b/src/main/java/org/apache/sling/commons/contentdetection/package-info.java
@@ -26,9 +26,6 @@
* @version 1.0.0
*/
@Version("1.0.0")
-@Export(optional = "provide:=true")
package org.apache.sling.commons.contentdetection;
-import aQute.bnd.annotation.Export;
-import aQute.bnd.annotation.Version;
-
+import org.osgi.annotation.versioning.Version;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.