Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
[versions]
# plugings
kotlin = "2.1.20"
kotlin = "2.2.0"
dokka = "2.0.0"
nexus = "2.0.0"
semver-git = "2.3.7"
openapi-gen = "7.13.0"
spotless = "7.0.3"
shadow-jar = "8.3.6"
openapi-gen = "7.14.0"
spotless = "7.0.4"
shadow-jar = "8.3.8"
download = "5.6.0"

# OpenZiti Edge API
ziti-api = "0.26.42"
ziti-cli = "1.5.4"

# third party
lazysodium-java = "5.1.4"
lazysodium-java = "5.2.0"
coroutines = "1.10.2"
slf4j = "2.0.17"
jupiter = "5.12.2"
jupiter = "5.13.3"
gson = "2.13.1"
tls-channel = "0.9.1"
jjwt = "0.12.6"
netty = "4.2.1.Final"
netty = "4.2.2.Final"
lombok = "1.18.36"
springboot = "3.2.5"
jackson = "2.19.0"
jackson = "2.19.1"
jakarta-annotation = "1.3.5"
okhttp3 = "4.12.0"
protobuf = "4.30.2"
metrics = "4.2.30"
bouncycastle = "1.80"
okhttp3 = "5.0.0"
protobuf = "4.31.1"
metrics = "4.2.33"
bouncycastle = "1.81"

clikt = "2.8.0"

Expand Down
2 changes: 1 addition & 1 deletion ziti-springboot-client/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dependencies {
implementation("org.springframework.boot:spring-boot:${springbootVersion}")
implementation("org.springframework.boot:spring-boot-autoconfigure:${springbootVersion}")
implementation("org.springframework.boot:spring-boot-starter-web:${springbootVersion}")
implementation("org.apache.httpcomponents.client5:httpclient5:5.4.4")
implementation("org.apache.httpcomponents.client5:httpclient5:5.5")
implementation("commons-beanutils:commons-beanutils:1.11.0")

compileOnly("org.projectlombok:lombok:${lombokVersion}")
Expand Down
2 changes: 1 addition & 1 deletion ziti-vertx/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ dependencies {
implementation(project(":ziti-netty"))

implementation(libs.kotlin.lib)
implementation("io.vertx:vertx-core:4.5.14")
implementation("io.vertx:vertx-core:5.0.1")

testApi(libs.jupiter.api)
testImplementation(libs.jupiter.engine)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.openziti.vertx

import io.netty.channel.*
import io.netty.channel.nio.NioIoHandler
import io.netty.channel.socket.DatagramChannel
import io.netty.channel.socket.InternetProtocolFamily
import io.vertx.core.spi.transport.Transport
Expand Down Expand Up @@ -58,4 +59,6 @@ class ZitiTransport(val ztx: ZitiContext, val binding: Map<Int, ZitiAddress.Bind
super.convert(address)
}
}

override fun ioHandlerFactory(): IoHandlerFactory = NioIoHandler.newFactory()
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ package org.openziti.integ

import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.asExecutor
import okhttp3.internal.notifyAll
import org.openziti.api.InterceptConfig
import org.openziti.api.InterceptV1Cfg
import org.openziti.management.ApiClient
import org.openziti.management.JSON
import org.openziti.management.api.AuthenticationApi
Expand Down
Loading