Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): Bump Spring Boot and Spring dependencies #3473

Merged
merged 2 commits into from
Feb 12, 2025
+33 −22
Merged

chore(deps): Bump Spring Boot and Spring dependencies #3473

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a5cecf
chore(deps): Bump Spring Boot and Spring dependencies
dominikriemer Feb 12, 2025
7925930
Add json-smart to dependency management
dominikriemer Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
chore(deps): Bump Spring Boot and Spring dependencies
  • Loading branch information
@dominikriemer
dominikriemer committed Feb 12, 2025
commit 6a5cecfe8d139c4c4965d8695ddaba6d813e708b
27 changes: 16 additions & 11 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -93,11 +93,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>
Expand All @@ -118,10 +118,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>
Expand Down Expand Up @@ -260,7 +260,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>
Expand Down Expand Up @@ -796,6 +796,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>
Expand Down
2 changes: 1 addition & 1 deletion streampipes-commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion streampipes-service-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
18 changes: 9 additions & 9 deletions ...pes-service-base/src/main/java/org/apache/streampipes/service/base/ServiceBaseConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading