mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-01-07 14:05:44 +00:00
Code Issues Releases Wiki Activity

Upgrade a few more dependencies (#2371)

Browse Source 
* jaxb and gmail

* admin-directory

* Upgrade a few more dependencies
This commit is contained in:
Lai Jiang
2024-03-14 13:37:54 -04:00
committed by GitHub
parent b9cfa65546
commit 6e57d93507
22 changed files with 215 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
dependencies.gradle
View File

@@ -39,26 +39,22 @@ ext {
// PINNED VERSIONS START HERE.
// Breaking changes causing compilation error.
// TODO: Upgrade to 1.8x+
'com.beust:jcommander:1.60',
// TODO: Migrate to com.google.cloud:google-cloud-dns if
// https://github.com/googleapis/google-cloud-java/issues/8929 is fixed.
// At least migrate to v2.
'com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0',
'com.google.apis:google-api-services-admin-directory:directory_v1-rev118-1.25.0',
// TODO: Migrate to v3
'com.google.apis:google-api-services-drive:v2-rev393-1.25.0',
'com.google.apis:google-api-services-gmail:v1-rev20220404-2.0.0',
'com.thoughtworks.qdox:qdox:1.12.1',
// TODO: Migrate to org.jline
'jline:jline:1.0',
// Remove after the legacy console is deleted.
'com.google.template:soy:2021-02-01',
'com.google.protobuf:protobuf-java:3.13.0',
'com.google.javascript:closure-compiler:v20210505',
// TODO: Remove after the legacy console is deleted.
'com.google.closure-stylesheets:closure-stylesheets:1.5.0',
// Our .xjb files are not compatible with newer binding specs: some
// xml elements' names have changed.
'com.sun.xml.bind:jaxb-xjc:2.3.3',
// Dependency groups with inconsistent version.
'com.google.javascript:closure-compiler:v20210505',
'com.google.protobuf:protobuf-java:3.13.0',
'com.google.template:soy:2021-02-01',
'org.seleniumhq.selenium:selenium-api:3.141.59',
'org.seleniumhq.selenium:selenium-chrome-driver:3.141.59',
'org.seleniumhq.selenium:selenium-java:3.141.59',
@@ -69,13 +65,14 @@ ext {
// Schema crawler 16.11+ breaks API and tries to register a SQL driver
// referenced (but not provided) by appengine-api-1.0-sdk.
// Try upgrading to the latest version after we are off GAE.
// TODO: Try upgrading to the latest version after we are off GAE.
'us.fatehi:schemacrawler:[16.10.1, 16.11.0)!!',
'us.fatehi:schemacrawler-api:[16.10.1, 16.11.0)!!',
'us.fatehi:schemacrawler-diagram:[16.10.1, 16.11.0)!!',
'us.fatehi:schemacrawler-tools:[16.10.1, 16.11.0)!!',
// Hibernate 6.0+ requires Jakarta EE.
// TODO: Upgrade to 6.0+ after we migrate to Jakarta EE persistence.
'org.hibernate:hibernate-core:[5.6.14.Final, 6.0)',
'org.hibernate:hibernate-hikaricp:[5.6.14.Final, 6.0)',
@@ -90,13 +87,16 @@ ext {
// OkHttp 5.0 is in alpha.
'com.squareup.okhttp3:okhttp:[4.10.0, 5.0.0)!!',
// Excluding versions 2.0 from google-api-client because they're
// runtime incompatible with version 1.25 of admin directory API.
// TODO: see if we can upgrade to a newer version of the latter.
'com.google.api-client:google-api-client-java6:[1.31.3,2.0)!!',
'com.google.api-client:google-api-client:[1.31.3,2.0)!!',
'com.google.api-client:google-api-client-appengine:[1.31.3,2.0)',
'com.google.api-client:google-api-client-servlet:[1.31.3,2.0)',
// jaxb-xjc 2.4 and above requires changing the namespace to Jakarta EE
// TODO: Remove the cap after we upgrade to Jakarta EE xml Binding
// (I think).
'com.sun.xml.bind:jaxb-xjc:[2.3.3, 2.4)!!',
// Excluding versions 2.0+ because it is runtime incompatible with the
// pinned google-api-services-(dns|drive) libraries. They have a
// hardcoded dependency on major version version 1.
// TODO: Remove the cap after the pins are removed.
'com.google.api-client:google-api-client:[1.31.3,2)!!',
// DYNAMIC VERSIONS START HERE.
@@ -104,14 +104,19 @@ ext {
'args4j:args4j:[2.0.26,)',
'com.fasterxml.jackson.core:jackson-databind:[2.11.2,)',
'com.github.ben-manes.caffeine:caffeine:[3.0.0,)',
'com.google.api-client:google-api-client-appengine:[1.31.3,)',
'com.google.api-client:google-api-client-java6:[1.31.3,)',
'com.google.api-client:google-api-client-servlet:[1.31.3,)',
'com.google.api.grpc:proto-google-cloud-secretmanager-v1:[1.4.0,)',
'com.google.api.grpc:proto-google-cloud-tasks-v2:[1.33.2,)',
'com.google.api.grpc:proto-google-common-protos:[2.1.0,)',
'com.google.api:gax:[1.66.0,)',
'com.google.apis:google-api-services-admin-directory:[directory_v1-rev20240102-2.0.0,)',
'com.google.apis:google-api-services-appengine:[v1-rev130-1.25.0,)',
'com.google.apis:google-api-services-bigquery:[v2-rev459-1.25.0,)',
'com.google.apis:google-api-services-cloudkms:[v1-rev108-1.25.0,)',
'com.google.apis:google-api-services-dataflow:[v1b3-rev302-1.25.0,)',
'com.google.apis:google-api-services-gmail:[v1-rev20220404-2.0.0,)',
'com.google.apis:google-api-services-groupssettings:[v1-rev82-1.25.0,)',
'com.google.apis:google-api-services-monitoring:[v3-rev540-1.25.0,)',
'com.google.apis:google-api-services-sheets:[v4-rev612-1.25.0,)',
@@ -176,6 +181,7 @@ ext {
'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,)',
'javax.servlet:servlet-api:[2.5,)',