diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f58495f..4287a00 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 17 + java-version: 21 - name: Maven Install run: mvn install -B -V -DskipTests -Dair.check.skip-all - name: Maven Tests diff --git a/discovery-server/pom.xml b/discovery-server/pom.xml index ef8fe99..52e8b90 100644 --- a/discovery-server/pom.xml +++ b/discovery-server/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 @@ -18,10 +18,6 @@ - - io.airlift - jmx-http-rpc - com.fasterxml.jackson.core @@ -44,8 +40,9 @@ - com.google.inject - guice + com.google.errorprone + error_prone_annotations + true @@ -54,43 +51,38 @@ - joda-time - joda-time - - - - org.weakref - jmxutils + com.google.inject + guice - org.iq80.leveldb - leveldb-api + io.airlift + bootstrap - org.iq80.leveldb - leveldb + io.airlift + concurrent io.airlift - bootstrap + configuration io.airlift - concurrent + discovery io.airlift - discovery + event-http io.airlift - log + http-client @@ -105,53 +97,51 @@ io.airlift - node + jmx - io.airlift - json + jmx-http-rpc io.airlift - trace-token + json io.airlift - units + log io.airlift - http-client + node io.airlift - configuration + trace-token io.airlift - event-http + tracing io.airlift - jmx + units - io.airlift - tracing + jakarta.annotation + jakarta.annotation-api - com.google.errorprone - error_prone_annotations - true + jakarta.validation + jakarta.validation-api @@ -160,20 +150,23 @@ - jakarta.annotation - jakarta.annotation-api + joda-time + joda-time - jakarta.validation - jakarta.validation-api + org.iq80.leveldb + leveldb - - org.testng - testng - test + org.iq80.leveldb + leveldb-api + + + + org.weakref + jmxutils @@ -181,5 +174,12 @@ testing test + + + + org.testng + testng + test + diff --git a/pom.xml b/pom.xml index a59b840..24bcaba 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.airlift airbase - 143 + 156 io.airlift.discovery @@ -31,13 +31,6 @@ - - scm:git:git://github.com/airlift/discovery.git - scm:git:git@github.com:airlift/discovery.git - https://github.com/airlift/discovery - HEAD - - dain @@ -51,34 +44,30 @@ + + discovery-server + + + + scm:git:git://github.com/airlift/discovery.git + scm:git:git@github.com:airlift/discovery.git + HEAD + https://github.com/airlift/discovery + + true all,-missing - 17 + 21 - 234 + 247 ${dep.airlift.version} 0.12 - - discovery-server - - - - org.iq80.leveldb - leveldb-api - ${dep.leveldb.version} - - - - org.iq80.leveldb - leveldb - ${dep.leveldb.version} - io.airlift @@ -91,7 +80,18 @@ io.airlift units - 1.6 + 1.10 + + + + org.iq80.leveldb + leveldb + ${dep.leveldb.version} + + + org.iq80.leveldb + leveldb-api + ${dep.leveldb.version}