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/09/07 12:57:13 UTC
[sling-org-apache-sling-serviceusermapper] branch master updated
(b0c43bb -> 1bd4e68)
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-serviceusermapper.git.
from b0c43bb Updating badges for org-apache-sling-serviceusermapper
new 075b3e9 SLING-7891 Use bnd Maven plugins
new 1bd4e68 [maven-release-plugin] prepare release org.apache.sling.serviceusermapper-1.4.2
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 | 16 ++++++++++++++++
pom.xml | 59 +++++++++++++++++++++++++++++++----------------------------
2 files changed, 47 insertions(+), 28 deletions(-)
create mode 100644 bnd.bnd
[sling-org-apache-sling-serviceusermapper] 02/02:
[maven-release-plugin] prepare release
org.apache.sling.serviceusermapper-1.4.2
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-serviceusermapper.git
commit 1bd4e6806b0663f6d721126f36a91c7c30fc4de4
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Sep 7 14:57:11 2018 +0200
[maven-release-plugin] prepare release org.apache.sling.serviceusermapper-1.4.2
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1c76a71..a62acb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.serviceusermapper</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.2</version>
<name>Apache Sling Service User Mapper</name>
<description>
@@ -42,7 +42,7 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-serviceusermapper.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-serviceusermapper.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-serviceusermapper.git</url>
- <tag>HEAD</tag>
+ <tag>org.apache.sling.serviceusermapper-1.4.2</tag>
</scm>
<build>
[sling-org-apache-sling-serviceusermapper] 01/02: SLING-7891 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-serviceusermapper.git
commit 075b3e93f890a7f33114364540bbf57c0c553555
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Sep 7 14:49:20 2018 +0200
SLING-7891 Use bnd Maven plugins
---
bnd.bnd | 16 ++++++++++++++++
pom.xml | 55 +++++++++++++++++++++++++++++--------------------------
2 files changed, 45 insertions(+), 26 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..24d7c8e
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,16 @@
+DynamicImport-Package:\
+ org.apache.felix.inventory
+
+Provide-Capability:\
+ osgi.service;objectClass=org.apache.sling.serviceusermapping.ServiceUserMapped
+
+Import-Package:\
+ org.apache.felix.inventory;resolution:=optional,\
+ *
+
+-includeresource:\
+ @org.apache.felix.utils-*.jar!/org/apache/felix/utils/json/JSONWriter*
+
+-removeheaders:\
+ Include-Resource,\
+ Private-Package
diff --git a/pom.xml b/pom.xml
index 3c81cb8..1c76a71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,12 +23,11 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>30</version>
+ <version>34</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.serviceusermapper</artifactId>
- <packaging>bundle</packaging>
<version>1.4.1-SNAPSHOT</version>
<name>Apache Sling Service User Mapper</name>
@@ -49,26 +48,12 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Import-Package>
- org.apache.felix.inventory;resolution:=optional,
- *
- </Import-Package>
- <DynamicImport-Package>
- org.apache.felix.inventory
- </DynamicImport-Package>
- <Embed-Dependency>
- org.apache.felix.utils;inline=org/apache/felix/utils/json/JSONWriter**
- </Embed-Dependency>
- <Provide-Capability>
- osgi.service;objectClass=org.apache.sling.serviceusermapping.ServiceUserMapped
- </Provide-Capability>
- </instructions>
- </configuration>
+ <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>
@@ -106,19 +91,37 @@
<artifactId>slf4j-api</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </dependency>
+
+ <!-- OSGi -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.event</artifactId>
- <version>1.3.1</version>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.metatype.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- Testing -->