Skip to content

Update dependency com.google.guava:guava to v30 - abandoned #630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mend-for-github-com wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update dependency com.google.guava:guava to v30 - abandoned #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies {
implementation("org.eclipse.aether", "aether-transport-http", "1.1.0")
implementation("org.apache.maven", "maven-aether-provider", "3.3.9")

implementation("com.google.guava", "guava", "20.0")
implementation("com.google.guava", "guava", "30.0-android")
implementation("org.ow2.asm", "asm", "9.0")
implementation("org.ow2.asm", "asm-tree", "9.0")

Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/appsec/weblog/weblog-common/weblog-common.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ targetCompatibility = 1.6

dependencies {
api 'javax.servlet:servlet-api:2.4'
implementation group: 'com.google.guava', name: 'guava', version: '20.0'
implementation group: 'com.google.guava', name: 'guava', version: '30.0-android'
}
4 changes: 2 additions & 2 deletions dd-java-agent/instrumentation/datastax-cassandra-3/datastax-cassandra-3.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ muzzle {
// end up with testing compatibility with guava 0.16 which lacks the method invocation added to be compatible with
// most recent versions of guava (27+). While the long term solution is to make the muzzle plugin aware of upstream
// declared dependencies, for now we just make sure that we use the proper ones.
extraDependency "com.google.guava:guava:20.0"
extraDependency "com.google.guava:guava:30.0-android"
}

// Making sure that instrumentation works with recent versions of Guava which removed method
Expand All @@ -47,7 +47,7 @@ testSets {

dependencies {
compileOnly group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.0.0'
compileOnly group: 'com.google.guava', name: 'guava', version: '18.0'
compileOnly group: 'com.google.guava', name: 'guava', version: '30.0-android'

testImplementation group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.2.0'
testImplementation group: 'org.cassandraunit', name: 'cassandra-unit', version: '3.1.3.2'
Expand Down
4 changes: 2 additions & 2 deletions dd-java-agent/instrumentation/guava-10/guava-10.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ testSets {
}

dependencies {
compileOnly group: 'com.google.guava', name: 'guava', version: '10.0'
compileOnly group: 'com.google.guava', name: 'guava', version: '30.0-android'

testImplementation group: 'com.google.guava', name: 'guava', version: '16.0'
testImplementation group: 'com.google.guava', name: 'guava', version: '30.0-android'
// ^ first version with com.google.common.reflect.ClassPath.getAllClasses()

latestDepTestImplementation group: 'com.google.guava', name: 'guava', version: '+'
Expand Down
4 changes: 2 additions & 2 deletions dd-smoke-tests/osgi/osgi.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ dependencies {
compileOnly group: 'org.osgi', name: 'org.osgi.core', version: '4.2.0'
compileOnly group: 'org.osgi', name: 'org.osgi.compendium', version: '4.2.0'
compileOnly group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
compileOnly group: 'com.google.guava', name: 'guava', version: '20.0'
compileOnly group: 'com.google.guava', name: 'guava', version: '30.0-android'
compileOnly group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13'

equinox 'org.eclipse.platform:org.eclipse.osgi:3.15.300'
felix 'org.apache.felix:org.apache.felix.framework:6.0.4'

bundles 'org.ops4j.pax.logging:pax-logging-api:1.11.0'
bundles 'com.google.guava:guava:20.0'
bundles 'com.google.guava:guava:30.0-android'
bundles 'org.apache.felix:org.apache.felix.configadmin:1.9.18'
bundles 'org.apache.httpcomponents:httpcore-osgi:4.4.14'
bundles 'org.apache.httpcomponents:httpclient-osgi:4.5.13'
Expand Down