SLING-9384 - Update metrics-rrd4j to parent 38
Note that before the migration the org.rrd4j package only included resources
matching ConsolFun.*, but since that package (as of rrd4j 3.6 only includes)
an additional DsType class at 1017 bytes we include the whole package as
it simplifies configuration.
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..b6cc67a
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,12 @@
+Import-Package: com.mongodb;resolution:=optional,\
+ com.sleepycat.je;resolution:=optional,\
+ sun.misc;resolution:=optional,\
+ sun.nio.ch;resolution:=optional,\
+ *
+
+Conditional-Package: org.rrd4j,\
+ org.rrd4j.core,\
+ org.rrd4j.core.timespec,\
+ org.rrd4j.core.jrrd,\
+ org.rrd4j.data,\
+ com.tomgibara.crinch.hashing
diff --git a/pom.xml b/pom.xml
index 9962bda..05e94d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,13 +22,12 @@
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>31</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>38</version>
<relativePath/>
</parent>
<artifactId>org.apache.sling.commons.metrics-rrd4j</artifactId>
- <packaging>bundle</packaging>
<version>1.0.3-SNAPSHOT</version>
<name>Apache Sling Commons Metrics RRD4J</name>
@@ -47,27 +46,6 @@
<tag>HEAD</tag>
</scm>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Import-Package>
- com.mongodb;resolution:=optional,
- com.sleepycat.je;resolution:=optional,
- sun.misc;resolution:=optional,
- sun.nio.ch;resolution:=optional,
- *
- </Import-Package>
- <Embed-Dependency>rrd4j;inline=com/**|org/rrd4j/ConsolFun*|org/rrd4j/DsType*|org/rrd4j/core/**|org/rrd4j/data/**</Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
