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:25 UTC
[sling-org-apache-sling-commons-contentdetection] branch master
updated (48d554d -> 028e164)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-contentdetection.git.
from 48d554d SLING-7213 - Add a default .gitignore file to every module
new ca214c1 SLING-7353 Update to Sling Parent 33
new 028e164 SLING-7416 Use bnd Maven plugins
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
bnd.bnd | 19 +++++++++++
pom.xml | 37 +++++++++++-----------
.../commons/contentdetection/package-info.java | 5 +--
3 files changed, 39 insertions(+), 22 deletions(-)
create mode 100644 bnd.bnd
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-commons-contentdetection] 02/02: SLING-7416
Use bnd Maven plugins
Posted by ol...@apache.org.
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 028e1646403bfed859416115456098c00715e974
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jan 20 22:53:01 2018 +0100
SLING-7416 Use bnd Maven plugins
---
bnd.bnd | 19 +++++++++++++++++++
pom.xml | 10 ++++++----
2 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..9806ee8
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,19 @@
+Bundle-Category: sling
+
+Bundle-Description: ${project.description}
+
+Bundle-DocURL: https://sling.apache.org
+
+Bundle-License: Apache License, Version 2.0
+
+Bundle-Vendor: The Apache Software Foundation
+
+-baseline: *
+
+-exportcontents: ${packages;VERSIONED}
+
+-removeheaders:\
+ Embed-Dependency,\
+ Embed-Transitive,\
+ Include-Resource,\
+ Private-Package
diff --git a/pom.xml b/pom.xml
index abfe428..60f1799 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,6 @@
<artifactId>org.apache.sling.commons.contentdetection</artifactId>
<version>1.0.3-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling Content Detection Support</name>
<description>Content-based MIME type detection</description>
@@ -156,9 +155,12 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-baseline-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-commons-contentdetection] 01/02: SLING-7353
Update to Sling Parent 33
Posted by ol...@apache.org.
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>.