From 6e04880844d82de6e2d8ee1a6430842e5730d524 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az847-649.3soeacoywu2upfh4jr2diqk1yd.cx.internal.cloudapp.net>
Date: Thu, 18 Jan 2024 12:10:27 +0000
Subject: [PATCH 1/5] updating poms for branch'release-3.1.0' with non-snapshot
 versions

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index dca7ac9..6fbf895 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.swisspush</groupId>
     <artifactId>mod-metrics</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.0</version>
     <name>mod-metrics</name>
     <description>Vert.x Metrics module for JMX reporting</description>
     <url>https://github.com/swisspush/mod-metrics</url>

From 115d567e4e51b7e6f9db8e86a3747ae987a34fcf Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az847-649.3soeacoywu2upfh4jr2diqk1yd.cx.internal.cloudapp.net>
Date: Thu, 18 Jan 2024 12:10:27 +0000
Subject: [PATCH 2/5] updating poms for 3.1.1-SNAPSHOT development

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index dca7ac9..c37bf51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.swisspush</groupId>
     <artifactId>mod-metrics</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
     <name>mod-metrics</name>
     <description>Vert.x Metrics module for JMX reporting</description>
     <url>https://github.com/swisspush/mod-metrics</url>

From aa58172edeab9f89c6b44bf42187c375e7670338 Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az847-649.3soeacoywu2upfh4jr2diqk1yd.cx.internal.cloudapp.net>
Date: Thu, 18 Jan 2024 12:10:39 +0000
Subject: [PATCH 3/5] updating develop poms to master versions to avoid merge
 conflicts

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c37bf51..6fbf895 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.swisspush</groupId>
     <artifactId>mod-metrics</artifactId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.0</version>
     <name>mod-metrics</name>
     <description>Vert.x Metrics module for JMX reporting</description>
     <url>https://github.com/swisspush/mod-metrics</url>

From 47cc3aa8a63f29798617d3c66792e54a76c49e2b Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az847-649.3soeacoywu2upfh4jr2diqk1yd.cx.internal.cloudapp.net>
Date: Thu, 18 Jan 2024 12:10:39 +0000
Subject: [PATCH 4/5] Updating develop poms back to pre merge state

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6fbf895..c37bf51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.swisspush</groupId>
     <artifactId>mod-metrics</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.1-SNAPSHOT</version>
     <name>mod-metrics</name>
     <description>Vert.x Metrics module for JMX reporting</description>
     <url>https://github.com/swisspush/mod-metrics</url>

From 41f933704a8b4f4ccf344e5dcb6ed4768eea58ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Weber?= <mcweba@users.noreply.github.com>
Date: Wed, 3 Apr 2024 07:42:29 +0200
Subject: [PATCH 5/5] Update to Vert.x 4.5.2 (cve-2024-1023)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c37bf51..ddf54d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
         <repositoryId />
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
-        <vertx.version>4.5.1</vertx.version>
+        <vertx.version>4.5.2</vertx.version>
         <junit.version>4.13.2</junit.version>
         <core-metrics.version>4.2.23</core-metrics.version>
     </properties>