Move `outdated` deps to regular rje deps (#752) This means that it's in the lock file (so no-one needs to re-resolve the dependencies), and also means that the tests which are failing as we attempt to move to the BCR pass. As part of this work, we'll need another RJE release, so this also bumps the version in the module file.
diff --git a/MODULE.bazel b/MODULE.bazel index 8e80a12..0b1e7ee 100644 --- a/MODULE.bazel +++ b/MODULE.bazel
@@ -1,6 +1,6 @@ module( name = "rules_jvm_external", - version = "4.4.1", + version = "4.4.2", ) bazel_dep(name = "bazel_skylib", version = "1.2.1") @@ -21,6 +21,7 @@ "com.google.cloud:google-cloud-core:1.93.10", "com.google.cloud:google-cloud-storage:1.113.4", "com.google.code.gson:gson:2.9.0", + "org.apache.maven:maven-artifact:3.8.6", "software.amazon.awssdk:s3:2.17.183", ], lock_file = "@rules_jvm_external//:rules_jvm_external_deps_install.json",
diff --git a/WORKSPACE b/WORKSPACE index c048ca7..fa739ba 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -101,16 +101,6 @@ load("//:specs.bzl", "maven") maven_install( - name = "outdated", - artifacts = [ - "org.apache.maven:maven-artifact:3.6.3", - ], - repositories = [ - "https://repo1.maven.org/maven2", - ], -) - -maven_install( artifacts = [ "com.google.guava:guava:27.0-jre", "org.hamcrest:hamcrest-core:2.1",
diff --git a/private/tools/java/rules/jvm/external/maven/BUILD b/private/tools/java/rules/jvm/external/maven/BUILD index 549bb6d..c2c118d 100644 --- a/private/tools/java/rules/jvm/external/maven/BUILD +++ b/private/tools/java/rules/jvm/external/maven/BUILD
@@ -28,6 +28,9 @@ main_class = "rules.jvm.external.maven.Outdated", visibility = ["//visibility:public"], deps = [ - "@outdated//:org_apache_maven_maven_artifact", + artifact( + "org.apache.maven:maven-artifact", + repository_name = "rules_jvm_external_deps", + ), ], )
diff --git a/repositories.bzl b/repositories.bzl index a5cf938..d692589 100644 --- a/repositories.bzl +++ b/repositories.bzl
@@ -12,6 +12,7 @@ "com.google.cloud:google-cloud-core:1.93.10", "com.google.cloud:google-cloud-storage:1.113.4", "com.google.code.gson:gson:2.9.0", + "org.apache.maven:maven-artifact:3.8.6", "software.amazon.awssdk:s3:2.17.183", ], maven_install_json = "@rules_jvm_external//:rules_jvm_external_deps_install.json",
diff --git a/rules_jvm_external_deps_install.json b/rules_jvm_external_deps_install.json index 8f27dfd..f92693c 100644 --- a/rules_jvm_external_deps_install.json +++ b/rules_jvm_external_deps_install.json
@@ -1,8 +1,8 @@ { "dependency_tree": { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": 1325991845, - "__RESOLVED_ARTIFACTS_HASH": 342768671, + "__INPUT_ARTIFACTS_HASH": -1908758683, + "__RESOLVED_ARTIFACTS_HASH": 946608907, "conflict_resolution": {}, "dependencies": [ { @@ -1250,6 +1250,33 @@ "url": "https://repo1.maven.org/maven2/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar" }, { + "coord": "org.apache.commons:commons-lang3:3.8.1", + "dependencies": [], + "directDependencies": [], + "file": "v1/https/repo1.maven.org/maven2/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar", + "mirror_urls": [ + "https://repo1.maven.org/maven2/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar", + "https://maven.google.com/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar" + ], + "packages": [ + "org.apache.commons.lang3", + "org.apache.commons.lang3.arch", + "org.apache.commons.lang3.builder", + "org.apache.commons.lang3.concurrent", + "org.apache.commons.lang3.event", + "org.apache.commons.lang3.exception", + "org.apache.commons.lang3.math", + "org.apache.commons.lang3.mutable", + "org.apache.commons.lang3.reflect", + "org.apache.commons.lang3.text", + "org.apache.commons.lang3.text.translate", + "org.apache.commons.lang3.time", + "org.apache.commons.lang3.tuple" + ], + "sha256": "dac807f65b07698ff39b1b07bfef3d87ae3fd46d91bbf8a2bc02b2a831616f68", + "url": "https://repo1.maven.org/maven2/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar" + }, + { "coord": "org.apache.httpcomponents:httpclient:4.5.13", "dependencies": [ "commons-codec:commons-codec:1.11", @@ -1327,6 +1354,37 @@ "url": "https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.jar" }, { + "coord": "org.apache.maven:maven-artifact:3.8.6", + "dependencies": [ + "org.apache.commons:commons-lang3:3.8.1", + "org.codehaus.plexus:plexus-utils:3.3.1" + ], + "directDependencies": [ + "org.apache.commons:commons-lang3:3.8.1", + "org.codehaus.plexus:plexus-utils:3.3.1" + ], + "file": "v1/https/repo1.maven.org/maven2/org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6.jar", + "mirror_urls": [ + "https://repo1.maven.org/maven2/org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6.jar", + "https://maven.google.com/org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6.jar" + ], + "packages": [ + "org.apache.maven.artifact", + "org.apache.maven.artifact.handler", + "org.apache.maven.artifact.metadata", + "org.apache.maven.artifact.repository", + "org.apache.maven.artifact.repository.layout", + "org.apache.maven.artifact.repository.metadata", + "org.apache.maven.artifact.resolver", + "org.apache.maven.artifact.resolver.filter", + "org.apache.maven.artifact.versioning", + "org.apache.maven.repository", + "org.apache.maven.repository.legacy.metadata" + ], + "sha256": "de22a4c6f54fe31276a823b1bbd3adfd6823529e732f431b5eff0852c2b9252b", + "url": "https://repo1.maven.org/maven2/org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6.jar" + }, + { "coord": "org.checkerframework:checker-compat-qual:2.5.5", "dependencies": [], "directDependencies": [], @@ -1342,6 +1400,29 @@ "url": "https://repo1.maven.org/maven2/org/checkerframework/checker-compat-qual/2.5.5/checker-compat-qual-2.5.5.jar" }, { + "coord": "org.codehaus.plexus:plexus-utils:3.3.1", + "dependencies": [], + "directDependencies": [], + "file": "v1/https/repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1.jar", + "mirror_urls": [ + "https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1.jar", + "https://maven.google.com/org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1.jar" + ], + "packages": [ + "org.codehaus.plexus.util", + "org.codehaus.plexus.util.cli", + "org.codehaus.plexus.util.cli.shell", + "org.codehaus.plexus.util.dag", + "org.codehaus.plexus.util.introspection", + "org.codehaus.plexus.util.io", + "org.codehaus.plexus.util.reflection", + "org.codehaus.plexus.util.xml", + "org.codehaus.plexus.util.xml.pull" + ], + "sha256": "4b570fcdbe5a894f249d2eb9b929358a9c88c3e548d227a80010461930222f2a", + "url": "https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1.jar" + }, + { "coord": "org.reactivestreams:reactive-streams:1.0.3", "dependencies": [], "directDependencies": [],
diff --git a/tests/com/jvm/external/maven/BUILD b/tests/com/jvm/external/maven/BUILD index d0caa55..585d4b2 100644 --- a/tests/com/jvm/external/maven/BUILD +++ b/tests/com/jvm/external/maven/BUILD
@@ -17,7 +17,7 @@ ), artifact( "org.apache.maven:maven-artifact", - repository_name = "outdated", + repository_name = "rules_jvm_external_deps", ), artifact("org.hamcrest:hamcrest"), ],