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/22 11:24:37 UTC
[sling-org-apache-sling-rewriter] branch master updated (746e133 ->
8c4463e)
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-rewriter.git.
from 746e133 SLING-7213 - Add a default .gitignore file to every module
new 15feecf SLING-7353 Update to Sling Parent 33
new 8c4463e SLING-7420 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 | 23 +++++++++++++++++++++++
pom.xml | 39 +++++++++++++--------------------------
2 files changed, 36 insertions(+), 26 deletions(-)
create mode 100644 bnd.bnd
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-rewriter] 02/02: SLING-7420 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-rewriter.git
commit 8c4463e1918a590eefd1edb2f6ddc66a3ccd89f2
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Jan 22 12:24:29 2018 +0100
SLING-7420 Use bnd Maven plugins
---
bnd.bnd | 23 +++++++++++++++++++++++
pom.xml | 22 ++++++----------------
2 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..7dcd3be
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,23 @@
+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
+
+Import-Package:\
+ org.apache.cocoon.components.serializers.util;resolution:=optional,\
+ *
+
+-baseline: *
+
+-exportcontents: ${packages;VERSIONED}
+
+-removeheaders:\
+ Embed-Dependency,\
+ Embed-Transitive,\
+ Include-Resource,\
+ Private-Package
diff --git a/pom.xml b/pom.xml
index d71295e..4065597 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,6 @@
<artifactId>org.apache.sling.rewriter</artifactId>
<version>1.2.3-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling Rewriter</name>
<description>
@@ -51,8 +50,12 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
+ <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.sling</groupId>
@@ -68,19 +71,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Category>sling</Bundle-Category>
- <Import-Package>
- org.apache.cocoon.components.serializers.util;resolution:=optional,*
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-rewriter] 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-rewriter.git
commit 15feecff0ff0b09c710230e2ce379c48ef7e2c92
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Jan 22 12:20:44 2018 +0100
SLING-7353 Update to Sling Parent 33
---
pom.xml | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0c9a5a8..d71295e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>30</version>
+ <version>33</version>
<relativePath />
</parent>
@@ -103,14 +103,6 @@
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <goals>
- <goal>generate-depends-file</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
@@ -166,6 +158,11 @@
<!-- OSGi -->
<dependency>
<groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
@@ -174,11 +171,11 @@
<artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
+ <!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
-
<!-- testing -->
<dependency>
<groupId>junit</groupId>
--
To stop receiving notification emails like this one, please contact
olli@apache.org.