Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into bugfix/startup-prob…
Browse files Browse the repository at this point in the history
…lems
  • Loading branch information
Waschndolos committed Mar 28, 2024
2 parents a6d0843 + 0c3c655 commit 239db65
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 deletions.
7 changes: 7 additions & 0 deletions .mvn/extensions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
<extension>
<groupId>io.jenkins.tools.incrementals</groupId>
<artifactId>git-changelist-maven-extension</artifactId>
<version>1.7</version>
</extension>
</extensions>
2 changes: 2 additions & 0 deletions .mvn/maven.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-Pconsume-incrementals
-Pmight-produce-incrementals
13 changes: 8 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,17 @@
</parent>

<artifactId>prometheus</artifactId>
<version>2.5.3-SNAPSHOT</version>
<version>${revision}${changelist}</version>
<packaging>hpi</packaging>
<name>Prometheus metrics plugin</name>
<description>Expose Jenkins metrics in prometheus format</description>
<url>https://github.com/jenkinsci/prometheus-plugin</url>
<inceptionYear>2016</inceptionYear>

<properties>
<revision>2.5.3</revision>
<changelist>-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/prometheus-plugin</gitHubRepo>
<!-- when updated the io.jenkins.tools.bom:bom-X.Y.Z must be updated too -->
<jenkins.version>2.387.3</jenkins.version>

Expand Down Expand Up @@ -46,10 +49,10 @@
</developers>

<scm>
<connection>scm:git:https://github.com/jenkinsci/prometheus-plugin.git</connection>
<developerConnection>scm:git:git@github.com:jenkinsci/prometheus-plugin.git</developerConnection>
<url>https://github.com/jenkinsci/prometheus-plugin/</url>
<tag>prometheus-2.3.2</tag>
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
<developerConnection>scm:git:https@github.com:${gitHubRepo}.git</developerConnection>
<url>https://github.com/${gitHubRepo}</url>
<tag>${scmTag}</tag>
</scm>

<repositories>
Expand Down

0 comments on commit 239db65

Please sign in to comment.