From de372c4d47ed8dd31db2628a464db7e8e43bbd62 Mon Sep 17 00:00:00 2001 From: Lai Jiang Date: Thu, 14 Mar 2024 23:26:53 -0400 Subject: [PATCH] Replace javax.inject with jakarta.inject (#2372) Note that Dagger currently doesn't work with the Jakarta namespace and we have to cap the jakarta inject package version below 2.0 so that it sill provides classes in the old namespace. --- common/build.gradle | 2 +- common/gradle.lockfile | 3 ++- core/build.gradle | 4 +--- core/gradle.lockfile | 7 ++++--- db/gradle.lockfile | 7 ++++--- dependencies.gradle | 10 +++++++--- jetty/gradle.lockfile | 3 ++- networking/build.gradle | 2 +- networking/gradle.lockfile | 1 + prober/build.gradle | 2 +- prober/gradle.lockfile | 1 + proxy/build.gradle | 2 +- proxy/gradle.lockfile | 1 + services/backend/gradle.lockfile | 3 ++- services/bsa/gradle.lockfile | 3 ++- services/default/gradle.lockfile | 3 ++- services/pubapi/gradle.lockfile | 3 ++- services/tools/gradle.lockfile | 3 ++- util/build.gradle | 2 +- util/gradle.lockfile | 1 + 20 files changed, 39 insertions(+), 24 deletions(-) diff --git a/common/build.gradle b/common/build.gradle index 53cd275a6e..512f509b54 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -57,7 +57,7 @@ dependencies { implementation deps['com.github.ben-manes.caffeine:caffeine'] implementation deps['com.google.code.findbugs:jsr305'] implementation deps['com.google.guava:guava'] - implementation deps['javax.inject:javax.inject'] + implementation deps['jakarta.inject:jakarta.inject-api'] implementation deps['joda-time:joda-time'] implementation deps['com.google.flogger:flogger'] implementation deps['io.github.java-diff-utils:java-diff-utils'] diff --git a/common/gradle.lockfile b/common/gradle.lockfile index f228d9c0a7..821a6dc859 100644 --- a/common/gradle.lockfile +++ b/common/gradle.lockfile @@ -37,7 +37,8 @@ commons-collections:commons-collections:3.2.2=checkstyle info.picocli:picocli:4.6.2=checkstyle io.github.eisop:dataflow-errorprone:3.34.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,compileClasspath,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,testing,testingAnnotationProcessor,testingCompileClasspath -javax.inject:javax.inject:1=annotationProcessor,compileClasspath,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,testing,testingAnnotationProcessor,testingCompileClasspath +jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath +javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor joda-time:joda-time:2.12.7=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath net.sf.saxon:Saxon-HE:10.6=checkstyle diff --git a/core/build.gradle b/core/build.gradle index 5f219c1e2c..58a876f1ba 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -194,10 +194,8 @@ dependencies { testRuntimeOnly deps['guru.nidi:graphviz-java-all-j2v8'] testImplementation deps['io.github.classgraph:classgraph'] testRuntimeOnly deps['io.github.java-diff-utils:java-diff-utils'] - testImplementation deps['javax.annotation:javax.annotation-api'] - testImplementation deps['javax.annotation:jsr250-api'] implementation deps['javax.mail:mail'] - implementation deps['javax.inject:javax.inject'] + implementation deps['jakarta.inject:jakarta.inject-api'] implementation deps['javax.persistence:javax.persistence-api'] implementation deps['javax.servlet:servlet-api'] implementation deps['javax.xml.bind:jaxb-api'] diff --git a/core/gradle.lockfile b/core/gradle.lockfile index 7b559889f8..efafbbd796 100644 --- a/core/gradle.lockfile +++ b/core/gradle.lockfile @@ -309,6 +309,7 @@ io.outfoxx:swiftpoet:1.3.1=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,t io.perfmark:perfmark-api:0.27.0=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=jaxb +jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=soy jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jaxb javacc:javacc:4.1=css @@ -376,7 +377,7 @@ org.apache.sshd:sshd-common:2.12.1=testCompileClasspath,testRuntimeClasspath org.apache.sshd:sshd-core:2.12.1=testCompileClasspath,testRuntimeClasspath org.apache.sshd:sshd-scp:2.12.1=testCompileClasspath,testRuntimeClasspath org.apache.sshd:sshd-sftp:2.12.1=testCompileClasspath,testRuntimeClasspath -org.apache.tomcat:tomcat-annotations-api:11.0.0-M17=testCompileClasspath,testRuntimeClasspath +org.apache.tomcat:tomcat-annotations-api:11.0.0-M18=testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.bouncycastle:bcpg-jdk18on:1.77=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.bouncycastle:bcpkix-jdk18on:1.77=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -401,8 +402,8 @@ org.eclipse.jetty:jetty-server:9.4.49.v20220914=compileClasspath,deploy_jar,nonp org.eclipse.jetty:jetty-servlet:9.4.49.v20220914=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util-ajax:9.4.49.v20220914=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:9.4.49.v20220914=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:10.9.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.9.1=testRuntimeClasspath +org.flywaydb:flyway-core:10.10.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.10.0=testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/db/gradle.lockfile b/db/gradle.lockfile index 24f8dd69a5..0244b3cdc4 100644 --- a/db/gradle.lockfile +++ b/db/gradle.lockfile @@ -75,7 +75,8 @@ io.grpc:grpc-api:1.60.1=deploy_jar,runtimeClasspath,testRuntimeClasspath io.grpc:grpc-context:1.60.1=deploy_jar,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-http-util:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClasspath -javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:1.0.5=testCompileClasspath,testRuntimeClasspath +javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor joda-time:joda-time:2.12.7=testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath @@ -89,8 +90,8 @@ org.checkerframework:checker-compat-qual:2.5.3=testCompileClasspath,testRuntimeC org.checkerframework:checker-qual:3.12.0=checkstyle org.checkerframework:checker-qual:3.33.0=annotationProcessor,errorprone,testAnnotationProcessor org.checkerframework:checker-qual:3.42.0=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:10.9.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.9.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:10.10.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.10.0=deploy_jar,runtimeClasspath,testRuntimeClasspath org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath org.jacoco:org.jacoco.agent:0.8.11=jacocoAgent,jacocoAnt org.jacoco:org.jacoco.ant:0.8.11=jacocoAnt diff --git a/dependencies.gradle b/dependencies.gradle index 38a3ade3aa..cd0b506865 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -98,6 +98,12 @@ ext { // TODO: Remove the cap after the pins are removed. 'com.google.api-client:google-api-client:[1.31.3,2)!!', + // Dagger doesn't support the Jakarta namespace yet. Pre-2.0 Jakarta + // Inject still use the old javax namespace. + // TODO: Remove the cap when https://github.com/google/dagger/issues/2058 + // is released. + 'jakarta.inject:jakarta.inject-api:[1,2.0.0)!!', + // DYNAMIC VERSIONS START HERE. @@ -152,6 +158,7 @@ ext { 'com.google.http-client:google-http-client-appengine:[1.39.0,)', 'com.google.http-client:google-http-client-jackson2:[1.39.0,)', 'com.google.http-client:google-http-client:[1.39.0,)', + // TODO: Remove after the old console is removed (dependency of soy). 'com.google.inject:guice:[5.0.1,)', 'com.google.monitoring-client:contrib:[1.0.7,)', 'com.google.monitoring-client:metrics:[1.0.7,)', @@ -178,9 +185,6 @@ ext { 'io.github.classgraph:classgraph:[4.8.102,)', 'io.github.java-diff-utils:java-diff-utils:[4.9,)', 'io.netty:netty-tcnative-boringssl-static:[2.0.36.Final,)', - 'javax.annotation:javax.annotation-api:[1.3.2,)', - 'javax.annotation:jsr250-api:[1.0,)', - 'javax.inject:javax.inject:[1,)', // Upgrade to jakarta when we remove App Engine dependency 'javax.mail:mail:[1.4,)', 'javax.persistence:javax.persistence-api:[2.2,)', diff --git a/jetty/gradle.lockfile b/jetty/gradle.lockfile index 25abce944b..0d58d7452f 100644 --- a/jetty/gradle.lockfile +++ b/jetty/gradle.lockfile @@ -262,6 +262,7 @@ io.opencensus:opencensus-proto:0.2.0=deploy_jar,runtimeClasspath,testRuntimeClas io.outfoxx:swiftpoet:1.3.1=deploy_jar,runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=deploy_jar,runtimeClasspath,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:1.0.5=deploy_jar,runtimeClasspath,testRuntimeClasspath javax.activation:activation:1.1=deploy_jar,runtimeClasspath,testRuntimeClasspath javax.activation:javax.activation-api:1.2.0=deploy_jar,runtimeClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -328,7 +329,7 @@ org.eclipse.jetty:jetty-server:9.4.49.v20220914=deploy_jar,runtimeClasspath,test org.eclipse.jetty:jetty-servlet:9.4.49.v20220914=deploy_jar,runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util-ajax:9.4.49.v20220914=deploy_jar,runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:9.4.49.v20220914=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:10.9.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:10.10.0=deploy_jar,runtimeClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=deploy_jar,runtimeClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=deploy_jar,runtimeClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=deploy_jar,runtimeClasspath,testRuntimeClasspath diff --git a/networking/build.gradle b/networking/build.gradle index 1d53ddd2e2..929918eccc 100644 --- a/networking/build.gradle +++ b/networking/build.gradle @@ -24,7 +24,7 @@ dependencies { implementation deps['io.netty:netty-common'] implementation deps['io.netty:netty-handler'] implementation deps['io.netty:netty-transport'] - implementation deps['javax.inject:javax.inject'] + implementation deps['jakarta.inject:jakarta.inject-api'] implementation deps['org.bouncycastle:bcpkix-jdk18on'] implementation deps['org.bouncycastle:bcprov-jdk18on'] implementation project(':util') diff --git a/networking/gradle.lockfile b/networking/gradle.lockfile index 147dbfd659..7bfc2cde15 100644 --- a/networking/gradle.lockfile +++ b/networking/gradle.lockfile @@ -112,6 +112,7 @@ io.opencensus:opencensus-api:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClass io.opencensus:opencensus-contrib-http-util:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-proto:0.2.0=deploy_jar,runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:activation:1.1=deploy_jar,runtimeClasspath,testRuntimeClasspath javax.activation:javax.activation-api:1.2.0=deploy_jar,runtimeClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=deploy_jar,runtimeClasspath,testRuntimeClasspath diff --git a/prober/build.gradle b/prober/build.gradle index f7f14537fb..7f32c0a1c2 100644 --- a/prober/build.gradle +++ b/prober/build.gradle @@ -32,7 +32,7 @@ dependencies { implementation deps['io.netty:netty-common'] implementation deps['io.netty:netty-handler'] implementation deps['io.netty:netty-transport'] - implementation deps['javax.inject:javax.inject'] + implementation deps['jakarta.inject:jakarta.inject-api'] implementation deps['joda-time:joda-time'] implementation deps['org.bouncycastle:bcpkix-jdk18on'] implementation deps['org.bouncycastle:bcprov-jdk18on'] diff --git a/prober/gradle.lockfile b/prober/gradle.lockfile index 3aca677fb5..dbd17361c0 100644 --- a/prober/gradle.lockfile +++ b/prober/gradle.lockfile @@ -115,6 +115,7 @@ io.opencensus:opencensus-api:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClass io.opencensus:opencensus-contrib-http-util:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-proto:0.2.0=deploy_jar,runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:activation:1.1=deploy_jar,runtimeClasspath,testRuntimeClasspath javax.activation:javax.activation-api:1.2.0=deploy_jar,runtimeClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=deploy_jar,runtimeClasspath,testRuntimeClasspath diff --git a/proxy/build.gradle b/proxy/build.gradle index 47c311140c..754c648d3b 100644 --- a/proxy/build.gradle +++ b/proxy/build.gradle @@ -62,7 +62,7 @@ dependencies { implementation deps['io.netty:netty-common'] implementation deps['io.netty:netty-handler'] implementation deps['io.netty:netty-transport'] - implementation deps['javax.inject:javax.inject'] + implementation deps['jakarta.inject:jakarta.inject-api'] implementation deps['joda-time:joda-time'] implementation deps['org.bouncycastle:bcpkix-jdk18on'] implementation deps['org.bouncycastle:bcprov-jdk18on'] diff --git a/proxy/gradle.lockfile b/proxy/gradle.lockfile index 821f481f3d..e3d68cb534 100644 --- a/proxy/gradle.lockfile +++ b/proxy/gradle.lockfile @@ -132,6 +132,7 @@ io.opencensus:opencensus-api:0.31.1=compileClasspath,deploy_jar,runtimeClasspath io.opencensus:opencensus-contrib-http-util:0.31.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-proto:0.2.0=deploy_jar,runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:activation:1.1=deploy_jar,runtimeClasspath,testRuntimeClasspath javax.activation:javax.activation-api:1.2.0=deploy_jar,runtimeClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/backend/gradle.lockfile b/services/backend/gradle.lockfile index fa996cd036..b21a49ee82 100644 --- a/services/backend/gradle.lockfile +++ b/services/backend/gradle.lockfile @@ -246,6 +246,7 @@ io.opencensus:opencensus-proto:0.2.0=compileClasspath,runtimeClasspath,testCompi io.outfoxx:swiftpoet:1.3.1=runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:activation:1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:javax.activation-api:1.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -308,7 +309,7 @@ org.eclipse.jetty:jetty-server:9.4.49.v20220914=compileClasspath,runtimeClasspat org.eclipse.jetty:jetty-servlet:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util-ajax:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:10.9.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:10.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/bsa/gradle.lockfile b/services/bsa/gradle.lockfile index fa996cd036..b21a49ee82 100644 --- a/services/bsa/gradle.lockfile +++ b/services/bsa/gradle.lockfile @@ -246,6 +246,7 @@ io.opencensus:opencensus-proto:0.2.0=compileClasspath,runtimeClasspath,testCompi io.outfoxx:swiftpoet:1.3.1=runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:activation:1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:javax.activation-api:1.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -308,7 +309,7 @@ org.eclipse.jetty:jetty-server:9.4.49.v20220914=compileClasspath,runtimeClasspat org.eclipse.jetty:jetty-servlet:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util-ajax:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:10.9.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:10.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/default/gradle.lockfile b/services/default/gradle.lockfile index fa996cd036..b21a49ee82 100644 --- a/services/default/gradle.lockfile +++ b/services/default/gradle.lockfile @@ -246,6 +246,7 @@ io.opencensus:opencensus-proto:0.2.0=compileClasspath,runtimeClasspath,testCompi io.outfoxx:swiftpoet:1.3.1=runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:activation:1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:javax.activation-api:1.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -308,7 +309,7 @@ org.eclipse.jetty:jetty-server:9.4.49.v20220914=compileClasspath,runtimeClasspat org.eclipse.jetty:jetty-servlet:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util-ajax:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:10.9.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:10.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/pubapi/gradle.lockfile b/services/pubapi/gradle.lockfile index fa996cd036..b21a49ee82 100644 --- a/services/pubapi/gradle.lockfile +++ b/services/pubapi/gradle.lockfile @@ -246,6 +246,7 @@ io.opencensus:opencensus-proto:0.2.0=compileClasspath,runtimeClasspath,testCompi io.outfoxx:swiftpoet:1.3.1=runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:activation:1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:javax.activation-api:1.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -308,7 +309,7 @@ org.eclipse.jetty:jetty-server:9.4.49.v20220914=compileClasspath,runtimeClasspat org.eclipse.jetty:jetty-servlet:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util-ajax:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:10.9.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:10.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/tools/gradle.lockfile b/services/tools/gradle.lockfile index fa996cd036..b21a49ee82 100644 --- a/services/tools/gradle.lockfile +++ b/services/tools/gradle.lockfile @@ -246,6 +246,7 @@ io.opencensus:opencensus-proto:0.2.0=compileClasspath,runtimeClasspath,testCompi io.outfoxx:swiftpoet:1.3.1=runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:activation:1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:javax.activation-api:1.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -308,7 +309,7 @@ org.eclipse.jetty:jetty-server:9.4.49.v20220914=compileClasspath,runtimeClasspat org.eclipse.jetty:jetty-servlet:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util-ajax:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:10.9.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:10.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/util/build.gradle b/util/build.gradle index 3bf8f5160b..51b03732fa 100644 --- a/util/build.gradle +++ b/util/build.gradle @@ -34,7 +34,7 @@ dependencies { implementation deps['com.google.re2j:re2j'] implementation deps['com.ibm.icu:icu4j'] implementation deps['commons-codec:commons-codec'] - implementation deps['javax.inject:javax.inject'] + implementation deps['jakarta.inject:jakarta.inject-api'] implementation deps['javax.mail:mail'] implementation deps['javax.xml.bind:jaxb-api'] implementation deps['joda-time:joda-time'] diff --git a/util/gradle.lockfile b/util/gradle.lockfile index 5d29100a54..425573a5a5 100644 --- a/util/gradle.lockfile +++ b/util/gradle.lockfile @@ -103,6 +103,7 @@ io.opencensus:opencensus-api:0.31.1=compileClasspath,deploy_jar,runtimeClasspath io.opencensus:opencensus-contrib-http-util:0.31.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-proto:0.2.0=deploy_jar,runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:activation:1.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:javax.activation-api:1.2.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath