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 2024/08/07 15:39:34 UTC

(sling-org-apache-sling-commons-metrics-prometheus) branch SLING-12395 updated (55dda88 -> 0fca5b4)

This is an automated email from the ASF dual-hosted git repository.

royteeuwen pushed a change to branch SLING-12395
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-metrics-prometheus.git


 discard 55dda88  Make the hotspot dependency optional as well
     new 0fca5b4  Make the hotspot dependency optional as well

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (55dda88)
            \
             N -- N -- N   refs/heads/SLING-12395 (0fca5b4)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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.


Summary of changes:


(sling-org-apache-sling-commons-metrics-prometheus) 01/01: Make the hotspot dependency optional as well

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

royteeuwen pushed a commit to branch SLING-12395
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-metrics-prometheus.git

commit 0fca5b4efedba0809ceb35df2a8675d02f60241b
Author: Roy Teeuwen <ro...@apache.org>
AuthorDate: Wed Aug 7 17:39:28 2024 +0200

    Make the hotspot dependency optional as well
---
 pom.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pom.xml b/pom.xml
index aa54fef..707306c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,20 @@
             <plugin>
                 <groupId>biz.aQute.bnd</groupId>
                 <artifactId>bnd-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>bnd-process</id>
+                        <goals>
+                            <goal>bnd-process</goal>
+                        </goals>
+                        <configuration>
+                            <bnd><![CDATA[
+# hotspot is only used for the DefaultJvmMetricsRegistrar, which is optional
+Import-Package: io.prometheus.client.hotspot;resolution:=optional,*
+                                ]]></bnd>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>biz.aQute.bnd</groupId>