You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2020/04/20 12:17:55 UTC
[sling-org-apache-sling-commons-metrics-rrd4j] annotated tag
org.apache.sling.commons.metrics-rrd4j-1.0.4 created (now 4518e26)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.commons.metrics-rrd4j-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-metrics-rrd4j.git.
at 4518e26 (tag)
tagging 6e2ec556a39e4e4e0f48fe3b6e32ef2d820cbacf (commit)
replaces org.apache.sling.commons.metrics-rrd4j-1.0.2
by Robert Munteanu
on Mon Apr 20 14:17:51 2020 +0200
- Log -----------------------------------------------------------------
[maven-release-plugin] copy for tag org.apache.sling.commons.metrics-rrd4j-1.0.4
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new 6e2ec55 SLING-9384 - Update metrics-rrd4j to parent 38
The 1 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.
[sling-org-apache-sling-commons-metrics-rrd4j] 01/01: SLING-9384 -
Update metrics-rrd4j to parent 38
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.commons.metrics-rrd4j-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-metrics-rrd4j.git
commit 6e2ec556a39e4e4e0f48fe3b6e32ef2d820cbacf
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Apr 20 14:15:17 2020 +0200
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.
---
bnd.bnd | 12 ++++++++++++
pom.xml | 26 ++------------------------
2 files changed, 14 insertions(+), 24 deletions(-)
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>