mirror/traccar
1
0
Fork 0
mirror of https://github.com/traccar/traccar.git synced 2025-12-24 00:00:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update Java dependencies

Browse Source
This commit is contained in:
Anton Tananaev
2025-12-07 10:08:23 -08:00
parent 14099e92b2
commit b8160c872f
3 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
build.gradle
View File

@@ -46,10 +46,10 @@ enforce {
ext {
guiceVersion = "7.0.0"
jettyVersion = "12.1.1"
jerseyVersion = "3.1.11"
nettyVersion = "4.2.6.Final"
protobufVersion = "4.32.1"
jettyVersion = "12.1.5"
jerseyVersion = "4.0.0"
nettyVersion = "4.2.7.Final"
protobufVersion = "4.33.2"
jxlsVersion = "2.14.0" // version 3 has breaking changes
junixsocketVersion = "2.10.1"
}
@@ -81,14 +81,14 @@ protobuf {
}
dependencies {
implementation "commons-codec:commons-codec:1.19.0"
implementation "com.h2database:h2:2.3.232"
implementation "com.mysql:mysql-connector-j:9.4.0"
implementation "commons-codec:commons-codec:1.20.0"
implementation "com.h2database:h2:2.4.240"
implementation "com.mysql:mysql-connector-j:9.5.0"
implementation "org.mariadb.jdbc:mariadb-java-client:3.5.6"
implementation "org.postgresql:postgresql:42.7.8"
implementation "com.kohlschutter.junixsocket:junixsocket-core:$junixsocketVersion"
implementation "com.kohlschutter.junixsocket:junixsocket-mysql:$junixsocketVersion"
implementation "com.microsoft.sqlserver:mssql-jdbc:13.2.0.jre11"
implementation "com.microsoft.sqlserver:mssql-jdbc:13.2.1.jre11"
implementation "com.zaxxer:HikariCP:7.0.2"
implementation "io.netty:netty-buffer:$nettyVersion"
implementation "io.netty:netty-codec:$nettyVersion"
@@ -118,31 +118,31 @@ dependencies {
implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jacksonVersion"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jakarta-jsonp:$jacksonVersion"
implementation "com.fasterxml.jackson.module:jackson-module-blackbird:$jacksonVersion"
implementation "org.liquibase:liquibase-core:4.33.0"
implementation "org.apache.commons:commons-jexl3:3.5.0"
implementation "org.liquibase:liquibase-core:5.0.1"
implementation "org.apache.commons:commons-jexl3:3.6.0"
implementation "org.jxls:jxls:$jxlsVersion"
implementation "org.jxls:jxls-poi:$jxlsVersion"
implementation "org.apache.velocity:velocity-engine-core:2.4.1"
implementation "org.apache.velocity.tools:velocity-tools-generic:3.1"
implementation "org.apache.commons:commons-collections4:4.5.0"
implementation "org.mnode.ical4j:ical4j:4.1.1"
implementation "org.mnode.ical4j:ical4j:4.2.1"
implementation "org.locationtech.spatial4j:spatial4j:0.8"
implementation "org.locationtech.jts:jts-core:1.20.0"
implementation "net.java.dev.jna:jna-platform:5.17.0"
implementation "com.github.jnr:jnr-posix:3.1.20"
implementation "net.java.dev.jna:jna-platform:5.18.1"
implementation "com.github.jnr:jnr-posix:3.1.21"
implementation "com.google.protobuf:protobuf-java:$protobufVersion"
implementation "software.amazon.awssdk:sns:2.34.0"
implementation "org.apache.kafka:kafka-clients:4.1.0"
implementation "com.hivemq:hivemq-mqtt-client:1.3.9"
implementation "redis.clients:jedis:6.2.0"
implementation "com.google.firebase:firebase-admin:9.6.0"
implementation "com.nimbusds:oauth2-oidc-sdk:11.28"
implementation "com.rabbitmq:amqp-client:5.26.0"
implementation "software.amazon.awssdk:sns:2.40.3"
implementation "org.apache.kafka:kafka-clients:4.1.1"
implementation "com.hivemq:hivemq-mqtt-client:1.3.10"
implementation "redis.clients:jedis:7.1.0"
implementation "com.google.firebase:firebase-admin:9.7.0"
implementation "com.nimbusds:oauth2-oidc-sdk:11.30.1"
implementation "com.rabbitmq:amqp-client:5.28.0"
implementation "com.warrenstrange:googleauth:1.5.0"
implementation "com.google.openlocationcode:openlocationcode:1.0.4"
implementation "io.modelcontextprotocol.sdk:mcp:0.13.1"
testImplementation "org.mockito:mockito-core:5.19.0"
testImplementation "org.junit.jupiter:junit-jupiter:5.13.4"
implementation "io.modelcontextprotocol.sdk:mcp:0.17.0"
testImplementation "org.mockito:mockito-core:5.20.0"
testImplementation "org.junit.jupiter:junit-jupiter:6.0.1"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
}

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

9
src/main/java/org/traccar/web/WebInjectionManagerFactory.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2022 Anton Tananaev (anton@traccar.org)
* Copyright 2022 - 2025 Anton Tananaev (anton@traccar.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
*/
package org.traccar.web;
import jakarta.ws.rs.core.Configuration;
import org.glassfish.hk2.api.ServiceLocator;
import org.glassfish.jersey.inject.hk2.Hk2InjectionManagerFactory;
import org.glassfish.jersey.internal.inject.InjectionManager;
@@ -47,4 +48,10 @@ public class WebInjectionManagerFactory implements InjectionManagerFactory {
public InjectionManager create(Object parent) {
return injectGuiceBridge(originalFactory.create(parent));
}
@Override
public InjectionManager create(Object parent, Configuration configuration) {
return injectGuiceBridge(originalFactory.create(parent, configuration));
}
}