post-merge fixes

Author: vinnybod

MODULE.bazel

@@ -64,14 +64,12 @@ maven.install(
         "org.slf4j:jul-to-slf4j:2.0.12",
         "org.slf4j:log4j-over-slf4j:2.0.12",
         "org.slf4j:slf4j-simple:2.0.12",
-        "org.slf4j:slf4j-api:2.0.12",
         "software.amazon.awssdk:s3:2.26.12",
         "software.amazon.awssdk:sdk-core:2.26.12",
         "org.bouncycastle:bcprov-jdk15on:1.68",
         "org.bouncycastle:bcpg-jdk15on:1.68",
         "org.gradle:gradle-tooling-api:%s" % _GRADLE_VERSION,
         "com.github.jknack:handlebars:4.3.1",
-        "com.google.http-client:google-http-client:1.45.0",
     ],
     fetch_sources = True,
     lock_file = "//:rules_jvm_external_deps_install.json",

private/rules/scala_export.bzl

@@ -110,7 +110,7 @@ def scala_export(
                 "$(location " + resource + ")"
                 for resource in doc_resources
             ],  # extra resources
-            tool = "@rules_jvm_external//private/tools/java/com/github/bazelbuild/rules_jvm_external/javadoc:create_jar",
+            tool = "@rules_jvm_external//private/tools/java/com/github/bazelbuild/rules_jvm_external/jar:CreateJar",
         )
         classifier_artifacts["scaladoc"] = scaladocs_jar_name
 

private/tools/java/com/github/bazelbuild/rules_jvm_external/jar/CreateJar.java

@@ -1,6 +1,7 @@
 package com.github.bazelbuild.rules_jvm_external.jar;
 
 import com.github.bazelbuild.rules_jvm_external.zip.StableZipEntry;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -64,13 +65,14 @@ public static void createJar(Path out, Path inputDir) throws IOException {
                 }
 
                 try {
+                  String name =
+                      inputDir.relativize(path).toString().replace(File.separatorChar, '/');
                   if (Files.isDirectory(path)) {
-                    String name = inputDir.relativize(path) + "/";
+                    name += "/";
                     ZipEntry entry = new StableZipEntry(name);
                     zos.putNextEntry(entry);
                     zos.closeEntry();
                   } else {
-                    String name = inputDir.relativize(path).toString();
                     ZipEntry entry = new StableZipEntry(name);
                     zos.putNextEntry(entry);
                     try (InputStream is = Files.newInputStream(path)) {

repositories.bzl

@@ -155,7 +155,6 @@ def rules_jvm_external_deps(
             "org.slf4j:jul-to-slf4j:2.0.12",
             "org.slf4j:log4j-over-slf4j:2.0.12",
             "org.slf4j:slf4j-simple:2.0.12",
-            "org.slf4j:slf4j-api:2.0.12",
             "software.amazon.awssdk:s3:2.26.12",
             "software.amazon.awssdk:sdk-core:2.26.12",
             "org.bouncycastle:bcprov-jdk15on:1.68",

tests/custom_maven_install/regression_testing_maven_install.json

@@ -1,7 +1,7 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
   "__INPUT_ARTIFACTS_HASH": 1002959493,
-  "__RESOLVED_ARTIFACTS_HASH": 661646060,
+  "__RESOLVED_ARTIFACTS_HASH": -458720370,
   "artifacts": {
     "com.almworks.sqlite4java:libsqlite4java-linux-amd64:so": {
       "shasums": {