Skip to content

Commit

Permalink
Java and Go updates in preparation of v3 release.
Browse files Browse the repository at this point in the history
Java DP:
- Update Java dependencies for v3.0.0 release.

Go DP:
- Fix examples version to work with the go tool.

Change-Id: If7d39cad87d2f416880712c78a79a2375ca93300
GitOrigin-RevId: 54a8e8833941e617e2d588868e7fd548f6bd81fe
  • Loading branch information
Differential Privacy Team authored and jspacek committed Mar 7, 2024
1 parent 7126f61 commit e9afef2
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 26 deletions.
4 changes: 2 additions & 2 deletions examples/go/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.21

require (
github.com/golang/glog v1.2.0
github.com/google/differential-privacy/go/v3 // a nonexistent version number
github.com/google/differential-privacy/go/v3 v3.0.0-local // a nonexistent version number
)

require (
Expand All @@ -13,4 +13,4 @@ require (
)

// To ensure the main branch works with the go tool when checked out locally.
replace github.com/google/differential-privacy/go v3.0.0-local => ../../go // see https://golang.org/doc/modules/managing-dependencies#local_directory
replace github.com/google/differential-privacy/go/v3 v3.0.0-local => ../../go // see https://golang.org/doc/modules/managing-dependencies#local_directory
10 changes: 5 additions & 5 deletions java/dp_java_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ def dp_java_deps():
"com.google.auto.value:auto-value-annotations:1.10.4",
"com.google.auto.value:auto-value:1.10.4",
"com.google.code.findbugs:jsr305:3.0.2",
"com.google.errorprone:error_prone_annotations:2.23.0",
"com.google.errorprone:error_prone_annotations:2.25.0",
"com.google.guava:guava:33.0.0-jre",
"com.google.protobuf:protobuf-java:3.25.0",
"com.google.protobuf:protobuf-java:3.25.3",
# artifacts for testing only
"org.mockito:mockito-core:5.7.0",
"org.mockito:mockito-core:5.11.0",
"junit:junit:4.13.2",
"com.google.truth:truth:1.4.0",
"com.google.truth.extensions:truth-java8-extension:1.4.0",
"com.google.truth:truth:1.4.2",
"com.google.truth.extensions:truth-java8-extension:1.4.2",
"com.google.testparameterinjector:test-parameter-injector:1.15",
],
repositories = [
Expand Down
35 changes: 16 additions & 19 deletions java/maven_install.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
{
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
"__INPUT_ARTIFACTS_HASH": -303031740,
"__RESOLVED_ARTIFACTS_HASH": 903391609,
"conflict_resolution": {
"com.google.errorprone:error_prone_annotations:2.23.0": "com.google.errorprone:error_prone_annotations:2.24.1"
},
"__INPUT_ARTIFACTS_HASH": -378409126,
"__RESOLVED_ARTIFACTS_HASH": 1488271150,
"artifacts": {
"com.google.auto.value:auto-value": {
"shasums": {
Expand All @@ -26,9 +23,9 @@
},
"com.google.errorprone:error_prone_annotations": {
"shasums": {
"jar": "19fe2f7155d20ea093168527999da98108103ee546d1e8b726bc4b27c31a3c30"
"jar": "47d91c141efd6b1d9231a322deca8f4c32dac8e940c6c38d768b36add221700d"
},
"version": "2.24.1"
"version": "2.25.0"
},
"com.google.guava:failureaccess": {
"shasums": {
Expand Down Expand Up @@ -56,9 +53,9 @@
},
"com.google.protobuf:protobuf-java": {
"shasums": {
"jar": "092452964d6b0660fac242b9212f1652f0db0a0257bdc9db5663cec2046d49ab"
"jar": "e90d8ddb963b20a972a6a59b5093ade2b07cbe546cab3279aaf4383260385f58"
},
"version": "3.25.0"
"version": "3.25.3"
},
"com.google.testparameterinjector:test-parameter-injector": {
"shasums": {
Expand All @@ -68,15 +65,15 @@
},
"com.google.truth.extensions:truth-java8-extension": {
"shasums": {
"jar": "293f4e4c59ce48e8b68651321d2d9f2355534412b221369b2af8ff76e6acf381"
"jar": "b31a61dac6a5147ffab497cb9d7bae283196f12e38dc53b5ec609424e911327b"
},
"version": "1.4.0"
"version": "1.4.2"
},
"com.google.truth:truth": {
"shasums": {
"jar": "235c28e96ee6701ab01cc852fb294cb0f34756f636a8154b9aef08fb1215bbc4"
"jar": "14c297bc64ca8bc15b6baf67f160627e4562ec91624797e312e907b431113508"
},
"version": "1.4.0"
"version": "1.4.2"
},
"junit:junit": {
"shasums": {
Expand All @@ -86,15 +83,15 @@
},
"net.bytebuddy:byte-buddy": {
"shasums": {
"jar": "377352e253282bf86f731ac90ed88348e8f40a63ce033c00a85982de7e790e6f"
"jar": "970636134d61c183b19f8f58fa631e30d2f2abca344b37848a393cac7863dd70"
},
"version": "1.14.9"
"version": "1.14.12"
},
"net.bytebuddy:byte-buddy-agent": {
"shasums": {
"jar": "11ed107d4b78e55f8c3d34250494375081a29bc125a1f5c56db582ccdd48835f"
"jar": "2b309a9300092e0b696f7c471fd51d9969001df784c8ab9f07997437d757ad6d"
},
"version": "1.14.9"
"version": "1.14.12"
},
"org.apache.commons:commons-math3": {
"shasums": {
Expand All @@ -116,9 +113,9 @@
},
"org.mockito:mockito-core": {
"shasums": {
"jar": "dbad5e746654910a11a59ecb4d01e38461f3e5d16161689dc2588d5554432521"
"jar": "f076c96b1f49b8d9bc42e46b0969aaf5684c40c8b5b679d400e5d880073a0e00"
},
"version": "5.7.0"
"version": "5.11.0"
},
"org.objenesis:objenesis": {
"shasums": {
Expand Down

0 comments on commit e9afef2

Please sign in to comment.