This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 6d9a694dcb chore(deps): Bump Spring Boot and Spring dependencies
(#3473)
6d9a694dcb is described below
commit 6d9a694dcb2701cc481a318a8db21b9e2e007e42
Author: Dominik Riemer <[email protected]>
AuthorDate: Wed Feb 12 11:43:51 2025 +0100
chore(deps): Bump Spring Boot and Spring dependencies (#3473)
* chore(deps): Bump Spring Boot and Spring dependencies
* Add json-smart to dependency management
---
pom.xml | 33 ++++++++++++++--------
streampipes-commons/pom.xml | 2 +-
streampipes-service-base/pom.xml | 2 +-
.../service/base/ServiceBaseConfig.java | 18 ++++++------
4 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/pom.xml b/pom.xml
index 79c079d87e..728851acfb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,12 +62,12 @@
<geojson-jackson.version>1.14</geojson-jackson.version>
<google-maps-services.version>2.2.0</google-maps-services.version>
<graalvm.js.version>23.0.0</graalvm.js.version>
- <gson.version>2.10</gson.version>
- <guava.version>33.2.0-jre</guava.version>
+ <gson.version>2.12.1</gson.version>
+ <guava.version>33.4.0-jre</guava.version>
<httpclient.version>4.5.13</httpclient.version>
<httpcore.version>4.4.9</httpcore.version>
<influxdb.version>2.24</influxdb.version>
- <inlong.version>1.12.0</inlong.version>
+ <inlong.version>1.13.0</inlong.version>
<iotdb.version>1.3.0</iotdb.version>
<jackson.version>2.17.0</jackson.version>
<jackson.databind.version>2.17.0</jackson.databind.version>
@@ -86,6 +86,7 @@
<jedis.version>5.1.4</jedis.version>
<jersey.version>3.1.3</jersey.version>
<jgrapht.version>1.5.1</jgrapht.version>
+ <json-smart.version>2.4.10</json-smart.version>
<jsrosbridge.version>0.2.0</jsrosbridge.version>
<jjwt.version>0.11.2</jjwt.version>
<jts-core.version>1.19.0</jts-core.version>
@@ -93,11 +94,11 @@
<lightcouch.version>0.2.0</lightcouch.version>
<maven-plugin-annotations.version>3.13.0</maven-plugin-annotations.version>
<mailapi.version>1.4.3</mailapi.version>
- <micrometer-prometheus.version>1.12.0</micrometer-prometheus.version>
- <micrometer-observation.version>1.12.0</micrometer-observation.version>
+ <micrometer-prometheus.version>1.14.3</micrometer-prometheus.version>
+ <micrometer-observation.version>1.14.3</micrometer-observation.version>
<mqtt-client.version>1.12</mqtt-client.version>
<nats.version>2.19.1</nats.version>
- <netty.version>4.1.72.Final</netty.version>
+ <netty.version>4.1.118.Final</netty.version>
<okhttp.version>3.13.1</okhttp.version>
<opencsv.version>5.9</opencsv.version>
<opennlp.version>2.3.1</opennlp.version>
@@ -118,10 +119,10 @@
<slack-api.version>1.4.0</slack-api.version>
<slf4j.version>2.0.6</slf4j.version>
<snakeyaml.version>2.2</snakeyaml.version>
- <springdoc.version>2.3.0</springdoc.version>
- <spring.version>6.1.1</spring.version>
- <spring-boot.version>3.2.0</spring-boot.version>
- <spring-security.version>6.3.0</spring-security.version>
+ <springdoc.version>2.8.4</springdoc.version>
+ <spring.version>6.2.2</spring.version>
+ <spring-boot.version>3.4.2</spring-boot.version>
+ <spring-security.version>6.4.2</spring-security.version>
<swagger.version>2.2.19</swagger.version>
<type-parser.version>0.8.1</type-parser.version>
<hawtbuf.version>1.11</hawtbuf.version>
@@ -260,7 +261,7 @@
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-prometheus</artifactId>
+
<artifactId>micrometer-registry-prometheus-simpleclient</artifactId>
<version>${micrometer-prometheus.version}</version>
</dependency>
<dependency>
@@ -328,6 +329,11 @@
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${jakarta-xml-bind-api.version}</version>
</dependency>
+ <dependency>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ <version>${json-smart.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
@@ -796,6 +802,11 @@
<artifactId>netty-transport</artifactId>
<version>${netty.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
<dependency>
<groupId>org.atteo.classindex</groupId>
<artifactId>classindex</artifactId>
diff --git a/streampipes-commons/pom.xml b/streampipes-commons/pom.xml
index dcd4d15142..af80ef01da 100644
--- a/streampipes-commons/pom.xml
+++ b/streampipes-commons/pom.xml
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-prometheus</artifactId>
+
<artifactId>micrometer-registry-prometheus-simpleclient</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/streampipes-service-base/pom.xml b/streampipes-service-base/pom.xml
index dc2d5780cf..114d63f7cb 100644
--- a/streampipes-service-base/pom.xml
+++ b/streampipes-service-base/pom.xml
@@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-prometheus</artifactId>
+
<artifactId>micrometer-registry-prometheus-simpleclient</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git
a/streampipes-service-base/src/main/java/org/apache/streampipes/service/base/ServiceBaseConfig.java
b/streampipes-service-base/src/main/java/org/apache/streampipes/service/base/ServiceBaseConfig.java
index d4866af124..e154019d94 100644
---
a/streampipes-service-base/src/main/java/org/apache/streampipes/service/base/ServiceBaseConfig.java
+++
b/streampipes-service-base/src/main/java/org/apache/streampipes/service/base/ServiceBaseConfig.java
@@ -26,22 +26,22 @@ public class ServiceBaseConfig {
private static final String ENDPOINT_INCLUDE_KEY =
"management.endpoints.web.exposure.include";
- private static final String ENDPOINTS_ENABLED_BY_DEFAULT =
"management.endpoints.enabled-by-default";
+ private static final String ENDPOINTS_ACCESS_DEFAULT =
"management.endpoints.access.default";
private static final String SERVER_PORT_KEY = "server.port";
public static void addPrometheusConfig(Properties properties) {
+ var env = Environments.getEnvironment();
+ String endpointAccessLevel =
env.getSetupPrometheusEndpoint().getValueOrDefault()
+ ? "read-only"
+ : "none";
- properties.setProperty(ENDPOINTS_ENABLED_BY_DEFAULT, Environments
- .getEnvironment()
- .getSetupPrometheusEndpoint()
- .getValueOrDefault()
- .toString());
+ properties.setProperty(ENDPOINTS_ACCESS_DEFAULT, endpointAccessLevel);
properties.setProperty(ENDPOINT_INCLUDE_KEY, Environments
- .getEnvironment()
-
.getPrometheusEndpointInclude()
- .getValueOrDefault());
+ .getEnvironment()
+ .getPrometheusEndpointInclude()
+ .getValueOrDefault());
}
public static void addPortConfig(Integer port, Properties properties) {
