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 14:23:27 UTC
[sling-org-apache-sling-scripting-core] branch master updated
(5dfb7a0 -> c64ce48)
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-scripting-core.git.
from 5dfb7a0 SLING-7353 Update to Sling Parent 33
new c7a44db SLING-7353 Update to Sling Parent 33
new c64ce48 SLING-7424 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 | 25 +++++++++++++++++++++++++
pom.xml | 28 +++++++---------------------
2 files changed, 32 insertions(+), 21 deletions(-)
create mode 100644 bnd.bnd
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-scripting-core] 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-scripting-core.git
commit c7a44db14e9f70a7effabf403476eb86c013d17a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Jan 22 15:20:51 2018 +0100
SLING-7353 Update to Sling Parent 33
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 12e0056..aa56c2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>32</version>
+ <version>33</version>
<relativePath />
</parent>
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-scripting-core] 02/02: SLING-7424 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-scripting-core.git
commit c64ce484bffe480df54bd623740d772f95db4ebd
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Jan 22 15:23:18 2018 +0100
SLING-7424 Use bnd Maven plugins
---
bnd.bnd | 25 +++++++++++++++++++++++++
pom.xml | 26 ++++++--------------------
2 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..ee66fb0
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,25 @@
+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
+
+Conditional-Package:\
+ org.apache.felix.utils.json.*
+
+-baseline: *
+
+-exportcontents: ${packages;VERSIONED}
+
+-includeresource:\
+ @org.apache.sling.commons.osgi-*.jar!/org/apache/sling/commons/osgi/PropertiesUtil.*
+
+-removeheaders:\
+ Embed-Dependency,\
+ Embed-Transitive,\
+ Include-Resource,\
+ Private-Package
diff --git a/pom.xml b/pom.xml
index aa56c2e..22a89a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,6 @@
<artifactId>org.apache.sling.scripting.core</artifactId>
<version>2.0.55-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling Scripting Core implementation</name>
<description>
@@ -50,29 +49,16 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Embed-Dependency>
- org.apache.sling.commons.osgi;inline="org/apache/sling/commons/osgi/PropertiesUtil.*"
- </Embed-Dependency>
- <!-- statically link JSONWriter (http://njbartlett.name/2014/05/26/static-linking.html) -->
- <Conditional-Package>org.apache.felix.utils.json.*</Conditional-Package>
- </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.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>generate-depends-file</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
--
To stop receiving notification emails like this one, please contact
olli@apache.org.