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 07:32:11 UTC
[sling-org-apache-sling-settings] branch master updated (8dc0a22 ->
0065b5b)
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-settings.git.
from 8dc0a22 Updating badges for org-apache-sling-settings
new 7139b02 SLING-7157 metatype.properties file must not be in OSGI-INF/metatype
new 0065b5b SLING-7889 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 | 43 +++++++---------------
.../{metatype => l10n}/metatype.properties | 0
...ling.settings.impl.SlingSettingsServiceImpl.xml | 2 +-
4 files changed, 33 insertions(+), 31 deletions(-)
create mode 100644 bnd.bnd
rename src/main/resources/OSGI-INF/{metatype => l10n}/metatype.properties (100%)
[sling-org-apache-sling-settings] 02/02: SLING-7889 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-settings.git
commit 0065b5bac4a67a0ff04ef26d57683ad7c601e3c6
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Sep 7 09:30:55 2018 +0200
SLING-7889 Use bnd Maven plugins
---
bnd.bnd | 19 +++++++++++++++++++
pom.xml | 43 +++++++++++++------------------------------
2 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..8c25158
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,19 @@
+Bundle-Activator: org.apache.sling.settings.impl.Activator
+
+Bundle-DocURL: http://sling.apache.org/documentation/bundles/sling-settings-orgapacheslingsettings.html
+
+DynamicImport-Package:\
+ org.osgi.service.cm,\
+ org.apache.felix.shell
+
+Provide-Capability:\
+ osgi.service;objectClass=org.apache.sling.settings.SlingSettingsService
+
+Import-Package:\
+ org.osgi.service.cm;resolution:=optional,\
+ org.apache.felix.shell;resolution:=optional,\
+ *
+
+-removeheaders:\
+ Include-Resource,\
+ Private-Package
diff --git a/pom.xml b/pom.xml
index 693cb02..22ef293 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.settings</artifactId>
- <packaging>bundle</packaging>
<version>1.3.9-SNAPSHOT</version>
<name>Apache Sling Settings</name>
@@ -50,40 +49,24 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-DocURL>
- http://sling.apache.org/documentation/bundles/sling-settings-orgapacheslingsettings.html
- </Bundle-DocURL>
- <Private-Package>
- org.apache.sling.settings.impl
- </Private-Package>
- <Bundle-Activator>
- org.apache.sling.settings.impl.Activator
- </Bundle-Activator>
- <DynamicImport-Package>
- org.osgi.service.cm,
- org.apache.felix.shell
- </DynamicImport-Package>
- <Import-Package>
- org.osgi.service.cm;resolution:=optional,
- org.apache.felix.shell;resolution:=optional,
- *
- </Import-Package>
- <Provide-Capability>
- osgi.service;objectClass=org.apache.sling.settings.SlingSettingsService
- </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>
</plugins>
</build>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
</dependency>
<dependency>
[sling-org-apache-sling-settings] 01/02: SLING-7157
metatype.properties file must not be in OSGI-INF/metatype
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-settings.git
commit 7139b0253644d2e5f40fb3b68f54c2b6cf96774a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Sep 7 08:53:00 2018 +0200
SLING-7157 metatype.properties file must not be in OSGI-INF/metatype
---
src/main/resources/OSGI-INF/{metatype => l10n}/metatype.properties | 0
.../org.apache.sling.settings.impl.SlingSettingsServiceImpl.xml | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/resources/OSGI-INF/metatype/metatype.properties b/src/main/resources/OSGI-INF/l10n/metatype.properties
similarity index 100%
rename from src/main/resources/OSGI-INF/metatype/metatype.properties
rename to src/main/resources/OSGI-INF/l10n/metatype.properties
diff --git a/src/main/resources/OSGI-INF/metatype/org.apache.sling.settings.impl.SlingSettingsServiceImpl.xml b/src/main/resources/OSGI-INF/metatype/org.apache.sling.settings.impl.SlingSettingsServiceImpl.xml
index 0471a2e..ede0b76 100644
--- a/src/main/resources/OSGI-INF/metatype/org.apache.sling.settings.impl.SlingSettingsServiceImpl.xml
+++ b/src/main/resources/OSGI-INF/metatype/org.apache.sling.settings.impl.SlingSettingsServiceImpl.xml
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
--><metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0"
- localization="OSGI-INF/metatype/metatype">
+ localization="OSGI-INF/l10n/metatype">
<OCD id="org.apache.sling.settings.impl.SlingSettingsServiceImpl" name="%settings.name" description="%settings.description">
<AD id="sling.name" type="String" name="%sling.name.name" description="%sling.name.description"/>
<AD id="sling.description" type="String" name="%sling.description.name" description="%sling.description.description"/>