This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-core.git
The following commit(s) were added to refs/heads/master by this push:
new 0223c7a SLING-9138 do no longer embed converter
0223c7a is described below
commit 0223c7a6e9fe7e32e052359c3b50903439b79d28
Author: Konrad Windszus <[email protected]>
AuthorDate: Tue Feb 25 09:45:07 2020 +0100
SLING-9138 do no longer embed converter
---
bnd.bnd | 1 -
pom.xml | 38 +++++++++++++++++++++++---------------
2 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
index 545a5af..2a20a11 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -1,7 +1,6 @@
-conditionalpackage: org.apache.sling.commons.osgi.*,\
org.apache.felix.cm.*,\
org.apache.felix.configurator.impl.*,\
- org.osgi.util.*,\
org.apache.sling.feature.io.*,\
javax.json.*,\
org.apache.johnzon.core.*
diff --git a/pom.xml b/pom.xml
index 305fe18..790954d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,14 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
<version>38</version>
- <relativePath />
+ <relativePath/>
</parent>
<artifactId>org.apache.sling.installer.core</artifactId>
@@ -48,13 +49,14 @@
<tag>HEAD</tag>
</scm>
-<build>
+ <build>
<plugins>
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-baseline-maven-plugin</artifactId>
<configuration>
- <!-- temporarily continue on error due to
https://github.com/bndtools/bnd/issues/3705, caused by switch from Java 7 ->
Java 8 -->
+ <!-- temporarily continue on error due to
https://github.com/bndtools/bnd/issues/3705, caused by switch from Java 7 ->
Java
+ 8 -->
<continueOnError>true</continueOnError>
</configuration>
</plugin>
@@ -88,13 +90,13 @@
<tasks name="Create a test bundle">
<jar
destfile="${project.build.directory}/${project.artifactId}-${project.version}-testbundle-1.0.jar">
<fileset
dir="${project.build.directory}/classes">
- <include name="META-INF/**" />
+ <include name="META-INF/**"/>
</fileset>
<manifest>
- <attribute name="Manifest-Version"
value="2" />
- <attribute name="Bundle-Name"
value="OSGi installer test bundle" />
- <attribute name="Bundle-SymbolicName"
value="osgi-installer-testbundle" />
- <attribute name="Bundle-Version"
value="1.0.4" />
+ <attribute name="Manifest-Version"
value="2"/>
+ <attribute name="Bundle-Name"
value="OSGi installer test bundle"/>
+ <attribute name="Bundle-SymbolicName"
value="osgi-installer-testbundle"/>
+ <attribute name="Bundle-Version"
value="1.0.4"/>
</manifest>
</jar>
</tasks>
@@ -162,6 +164,18 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.function</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.converter</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
@@ -192,12 +206,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.converter</artifactId>
- <version>1.0.8</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature.io</artifactId>
<version>1.2.0</version>
