Delete maven_jar, maven_server and --incompatible_remove_native_maven_jar

site/docs/rules.md

@@ -62,8 +62,6 @@ BUILD files without a `load` statement.
 * Workspace
   - [`bind`](be/workspace.html#bind)
   - [`local_repository`](be/workspace.html#local_repository)
-  - [`maven_jar`](be/workspace.html#maven_jar)
-  - [`maven_server`](be/workspace.html#maven_server)
   - [`new_local_repository`](be/workspace.html#new_local_repository)
   - [`xcode_config`](be/workspace.html#xcode_config)
   - [`xcode_version`](be/workspace.html#xcode_version)

src/main/java/com/google/devtools/build/lib/BUILD

@@ -928,7 +928,6 @@ java_library(
             "bazel/repository/**/*.java",
             "bazel/rules/workspace/*.java",
         ],
-        exclude = ["bazel/repository/MavenConnector.java"],
     ),
     resources = [
         "bazel/repository/local_config_platform.WORKSPACE",
@@ -945,7 +944,6 @@ java_library(
         ":build-base",
         ":events",
         ":io",
-        ":maven-connector",
         ":out-err",
         ":packages-internal",
         ":runtime",
@@ -978,15 +976,6 @@ java_library(
     ],
 )
 
-java_library(
-    name = "maven-connector",
-    srcs = ["bazel/repository/MavenConnector.java"],
-    deps = [
-        "//third_party:aether",
-        "//third_party:maven_model",
-    ],
-)
-
 # Rules
 java_library(
     name = "nativedeps-rules",

src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java

@@ -30,10 +30,6 @@
 import com.google.devtools.build.lib.bazel.commands.SyncCommand;
 import com.google.devtools.build.lib.bazel.repository.LocalConfigPlatformFunction;
 import com.google.devtools.build.lib.bazel.repository.LocalConfigPlatformRule;
-import com.google.devtools.build.lib.bazel.repository.MavenDownloader;
-import com.google.devtools.build.lib.bazel.repository.MavenJarFunction;
-import com.google.devtools.build.lib.bazel.repository.MavenServerFunction;
-import com.google.devtools.build.lib.bazel.repository.MavenServerRepositoryFunction;
 import com.google.devtools.build.lib.bazel.repository.RepositoryOptions;
 import com.google.devtools.build.lib.bazel.repository.RepositoryOptions.RepositoryOverride;
 import com.google.devtools.build.lib.bazel.repository.cache.RepositoryCache;
@@ -44,8 +40,6 @@
 import com.google.devtools.build.lib.bazel.rules.android.AndroidNdkRepositoryRule;
 import com.google.devtools.build.lib.bazel.rules.android.AndroidSdkRepositoryFunction;
 import com.google.devtools.build.lib.bazel.rules.android.AndroidSdkRepositoryRule;
-import com.google.devtools.build.lib.bazel.rules.workspace.MavenJarRule;
-import com.google.devtools.build.lib.bazel.rules.workspace.MavenServerRule;
 import com.google.devtools.build.lib.cmdline.RepositoryName;
 import com.google.devtools.build.lib.events.Event;
 import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
@@ -102,7 +96,6 @@ public class BazelRepositoryModule extends BlazeModule {
   private final SkylarkRepositoryFunction skylarkRepositoryFunction;
   private final RepositoryCache repositoryCache = new RepositoryCache();
   private final HttpDownloader httpDownloader = new HttpDownloader(repositoryCache);
-  private final MavenDownloader mavenDownloader = new MavenDownloader(repositoryCache);
   private final MutableSupplier<Map<String, String>> clientEnvironmentSupplier =
       new MutableSupplier<>();
   private ImmutableMap<RepositoryName, PathFragment> overrides = ImmutableMap.of();
@@ -116,7 +109,7 @@ public class BazelRepositoryModule extends BlazeModule {
 
   public BazelRepositoryModule() {
     this.skylarkRepositoryFunction = new SkylarkRepositoryFunction(httpDownloader);
-    this.repositoryHandlers = repositoryRules(httpDownloader, mavenDownloader);
+    this.repositoryHandlers = repositoryRules();
     ManagedDirectoriesListener listener =
         repositoryNamesWithManagedDirs -> {
           Set<String> conflicting =
@@ -136,15 +129,12 @@ public BazelRepositoryModule() {
     managedDirectoriesKnowledge = new ManagedDirectoriesKnowledgeImpl(listener);
   }
 
-  public static ImmutableMap<String, RepositoryFunction> repositoryRules(
-      HttpDownloader httpDownloader, MavenDownloader mavenDownloader) {
+  public static ImmutableMap<String, RepositoryFunction> repositoryRules() {
     return ImmutableMap.<String, RepositoryFunction>builder()
         .put(LocalRepositoryRule.NAME, new LocalRepositoryFunction())
-        .put(MavenJarRule.NAME, new MavenJarFunction(mavenDownloader))
         .put(NewLocalRepositoryRule.NAME, new NewLocalRepositoryFunction())
         .put(AndroidSdkRepositoryRule.NAME, new AndroidSdkRepositoryFunction())
         .put(AndroidNdkRepositoryRule.NAME, new AndroidNdkRepositoryFunction())
-        .put(MavenServerRule.NAME, new MavenServerRepositoryFunction())
         .put(LocalConfigPlatformRule.NAME, new LocalConfigPlatformFunction())
         .build();
   }
@@ -191,7 +181,6 @@ public void workspaceInit(
             directories,
             managedDirectoriesKnowledge);
     builder.addSkyFunction(SkyFunctions.REPOSITORY_DIRECTORY, repositoryDelegatorFunction);
-    builder.addSkyFunction(MavenServerFunction.NAME, new MavenServerFunction(directories));
     filesystem = runtime.getFileSystem();
   }