Skip to content

Commit

Permalink
Avoid asking users to add things to their maven workspace (#100)
Browse files Browse the repository at this point in the history
The google code formatter is just for us. Use the correct
import to avoid polluting the regular `@maven` workspace.
  • Loading branch information
shs96c authored Oct 12, 2022
1 parent 6d9fd3c commit 7b4dced
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 377 deletions.
4 changes: 1 addition & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ maven_install(
"io.grpc:grpc-services:1.40.0",
"io.grpc:grpc-stub:1.40.0",
"org.slf4j:slf4j-simple:1.7.32",
"com.google.googlejavaformat:google-java-format:1.15.0",

# These can be versioned independently of the versions in `repositories.bzl`
# so long as the version numbers are higher.
Expand Down Expand Up @@ -107,9 +108,6 @@ frozen_deps_pmi()
# These are used for our own tests.
maven_install(
artifacts = [
"com.google.code.findbugs:annotations:3.0.1",
"com.google.googlejavaformat:google-java-format:1.15.0",

# These can be versioned independently of the versions in `repositories.bzl`
# so long as the version numbers are higher.
"org.junit.jupiter:junit-jupiter-engine:5.8.2",
Expand Down
42 changes: 40 additions & 2 deletions frozen_deps_install.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"dependency_tree": {
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
"__INPUT_ARTIFACTS_HASH": -1395678455,
"__RESOLVED_ARTIFACTS_HASH": 1576619931,
"__INPUT_ARTIFACTS_HASH": -1270875482,
"__RESOLVED_ARTIFACTS_HASH": 211202528,
"conflict_resolution": {
"com.google.errorprone:error_prone_annotations:2.9.0": "com.google.errorprone:error_prone_annotations:2.11.0",
"com.google.guava:guava:30.1.1-jre": "com.google.guava:guava:31.1-jre",
Expand Down Expand Up @@ -606,6 +606,44 @@
"sha256": "31a8f1bd791fb22c606af95049062a3c8252ce4b1b17555d00dc609e6371101d",
"url": "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0-sources.jar"
},
{
"coord": "com.google.googlejavaformat:google-java-format:1.15.0",
"dependencies": [
"com.google.guava:guava:31.1-jre"
],
"directDependencies": [
"com.google.guava:guava:31.1-jre"
],
"file": "v1/https/repo1.maven.org/maven2/com/google/googlejavaformat/google-java-format/1.15.0/google-java-format-1.15.0.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/com/google/googlejavaformat/google-java-format/1.15.0/google-java-format-1.15.0.jar"
],
"packages": [
"com.google.googlejavaformat",
"com.google.googlejavaformat.java",
"com.google.googlejavaformat.java.filer",
"com.google.googlejavaformat.java.java14",
"com.google.googlejavaformat.java.javadoc"
],
"sha256": "4f546cfe159547ac3b9547daa9649e728f6abc254979c975f1cb9971793692c3",
"url": "https://repo1.maven.org/maven2/com/google/googlejavaformat/google-java-format/1.15.0/google-java-format-1.15.0.jar"
},
{
"coord": "com.google.googlejavaformat:google-java-format:jar:sources:1.15.0",
"dependencies": [
"com.google.guava:guava:jar:sources:31.1-jre"
],
"directDependencies": [
"com.google.guava:guava:jar:sources:31.1-jre"
],
"file": "v1/https/repo1.maven.org/maven2/com/google/googlejavaformat/google-java-format/1.15.0/google-java-format-1.15.0-sources.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/com/google/googlejavaformat/google-java-format/1.15.0/google-java-format-1.15.0-sources.jar"
],
"packages": [],
"sha256": "c55f0bd9fa6862a0629bb129ddbf425327f4869cbc9d503fd17c76cf8c2ef30c",
"url": "https://repo1.maven.org/maven2/com/google/googlejavaformat/google-java-format/1.15.0/google-java-format-1.15.0-sources.jar"
},
{
"coord": "com.google.guava:failureaccess:1.0.1",
"dependencies": [],
Expand Down
Binary file modified java/private/contrib_rules_jvm_deps.zip
Binary file not shown.
Loading

0 comments on commit 7b4dced

Please sign in to comment.