Add maven_aar rules
Test: bazel build everything
Change-Id: Ibda3b989c170e86dbeaa95f65ad0679b5a416163
diff --git a/common/m2/repository/antlr/antlr/2.7.7/BUILD b/common/m2/repository/antlr/antlr/2.7.7/BUILD
index 1da3c2e..97fe071 100644
--- a/common/m2/repository/antlr/antlr/2.7.7/BUILD
+++ b/common/m2/repository/antlr/antlr/2.7.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/aopalliance/aopalliance/1.0/BUILD b/common/m2/repository/aopalliance/aopalliance/1.0/BUILD
index 0c4e98a..0d14ec9 100644
--- a/common/m2/repository/aopalliance/aopalliance/1.0/BUILD
+++ b/common/m2/repository/aopalliance/aopalliance/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/asm/asm-analysis/3.3.1/BUILD b/common/m2/repository/asm/asm-analysis/3.3.1/BUILD
index 9dcbece..30a33a9 100644
--- a/common/m2/repository/asm/asm-analysis/3.3.1/BUILD
+++ b/common/m2/repository/asm/asm-analysis/3.3.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/asm/asm-commons/3.3/BUILD b/common/m2/repository/asm/asm-commons/3.3/BUILD
index 082afab..81a99f8 100644
--- a/common/m2/repository/asm/asm-commons/3.3/BUILD
+++ b/common/m2/repository/asm/asm-commons/3.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/asm/asm-parent/3.3.1/BUILD b/common/m2/repository/asm/asm-parent/3.3.1/BUILD
index 2852d24..d12ba1e 100644
--- a/common/m2/repository/asm/asm-parent/3.3.1/BUILD
+++ b/common/m2/repository/asm/asm-parent/3.3.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/asm/asm-parent/3.3/BUILD b/common/m2/repository/asm/asm-parent/3.3/BUILD
index d454618..b61238f 100644
--- a/common/m2/repository/asm/asm-parent/3.3/BUILD
+++ b/common/m2/repository/asm/asm-parent/3.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/asm/asm-tree/3.3.1/BUILD b/common/m2/repository/asm/asm-tree/3.3.1/BUILD
index de5d883..41417a5 100644
--- a/common/m2/repository/asm/asm-tree/3.3.1/BUILD
+++ b/common/m2/repository/asm/asm-tree/3.3.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/asm/asm-tree/3.3/BUILD b/common/m2/repository/asm/asm-tree/3.3/BUILD
index dc98769..894641a 100644
--- a/common/m2/repository/asm/asm-tree/3.3/BUILD
+++ b/common/m2/repository/asm/asm-tree/3.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/asm/asm-util/3.3.1/BUILD b/common/m2/repository/asm/asm-util/3.3.1/BUILD
index 8d89725..a22fc52 100644
--- a/common/m2/repository/asm/asm-util/3.3.1/BUILD
+++ b/common/m2/repository/asm/asm-util/3.3.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/asm/asm/3.3.1/BUILD b/common/m2/repository/asm/asm/3.3.1/BUILD
index 0d2c8e2..274565b 100644
--- a/common/m2/repository/asm/asm/3.3.1/BUILD
+++ b/common/m2/repository/asm/asm/3.3.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/asm/asm/3.3/BUILD b/common/m2/repository/asm/asm/3.3/BUILD
index 818bb1f..e0a0ff2 100644
--- a/common/m2/repository/asm/asm/3.3/BUILD
+++ b/common/m2/repository/asm/asm/3.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/avalon-framework/avalon-framework/4.1.3/BUILD b/common/m2/repository/avalon-framework/avalon-framework/4.1.3/BUILD
index 734221b..6593e78 100644
--- a/common/m2/repository/avalon-framework/avalon-framework/4.1.3/BUILD
+++ b/common/m2/repository/avalon-framework/avalon-framework/4.1.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/backport-util-concurrent/backport-util-concurrent/3.1/BUILD b/common/m2/repository/backport-util-concurrent/backport-util-concurrent/3.1/BUILD
index 2d89e61..a8b0b3c 100644
--- a/common/m2/repository/backport-util-concurrent/backport-util-concurrent/3.1/BUILD
+++ b/common/m2/repository/backport-util-concurrent/backport-util-concurrent/3.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/biz/aQute/bnd/1.50.0/BUILD b/common/m2/repository/biz/aQute/bnd/1.50.0/BUILD
index e4b8734..c97db9c 100644
--- a/common/m2/repository/biz/aQute/bnd/1.50.0/BUILD
+++ b/common/m2/repository/biz/aQute/bnd/1.50.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/biz/aQute/bndlib/1.50.0/BUILD b/common/m2/repository/biz/aQute/bndlib/1.50.0/BUILD
index 4e672f2..6403d90 100644
--- a/common/m2/repository/biz/aQute/bndlib/1.50.0/BUILD
+++ b/common/m2/repository/biz/aQute/bndlib/1.50.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/cglib/cglib-nodep/2.1_3/BUILD b/common/m2/repository/cglib/cglib-nodep/2.1_3/BUILD
index ffe38a9..8b7cfad 100644
--- a/common/m2/repository/cglib/cglib-nodep/2.1_3/BUILD
+++ b/common/m2/repository/cglib/cglib-nodep/2.1_3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/cglib/cglib-nodep/2.2.2/BUILD b/common/m2/repository/cglib/cglib-nodep/2.2.2/BUILD
index e097146..878e302 100644
--- a/common/m2/repository/cglib/cglib-nodep/2.2.2/BUILD
+++ b/common/m2/repository/cglib/cglib-nodep/2.2.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/cglib/cglib-nodep/3.1/BUILD b/common/m2/repository/cglib/cglib-nodep/3.1/BUILD
index 05dd477..325c1de 100644
--- a/common/m2/repository/cglib/cglib-nodep/3.1/BUILD
+++ b/common/m2/repository/cglib/cglib-nodep/3.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/classworlds/classworlds/1.1-alpha-2/BUILD b/common/m2/repository/classworlds/classworlds/1.1-alpha-2/BUILD
index 181e7df..2c62cad 100644
--- a/common/m2/repository/classworlds/classworlds/1.1-alpha-2/BUILD
+++ b/common/m2/repository/classworlds/classworlds/1.1-alpha-2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/classworlds/classworlds/1.1/BUILD b/common/m2/repository/classworlds/classworlds/1.1/BUILD
index 4f6b040..ecafa18 100644
--- a/common/m2/repository/classworlds/classworlds/1.1/BUILD
+++ b/common/m2/repository/classworlds/classworlds/1.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/almworks/sqlite4java/sqlite4java/0.282/BUILD b/common/m2/repository/com/almworks/sqlite4java/sqlite4java/0.282/BUILD
index d75fddc..67eac6a 100644
--- a/common/m2/repository/com/almworks/sqlite4java/sqlite4java/0.282/BUILD
+++ b/common/m2/repository/com/almworks/sqlite4java/sqlite4java/0.282/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/android/external/eclipse/org-eclipse-core-commands/3.6.0/BUILD b/common/m2/repository/com/android/external/eclipse/org-eclipse-core-commands/3.6.0/BUILD
index c471f08..39363f3 100644
--- a/common/m2/repository/com/android/external/eclipse/org-eclipse-core-commands/3.6.0/BUILD
+++ b/common/m2/repository/com/android/external/eclipse/org-eclipse-core-commands/3.6.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/android/external/eclipse/org-eclipse-equinox-common/3.6.0/BUILD b/common/m2/repository/com/android/external/eclipse/org-eclipse-equinox-common/3.6.0/BUILD
index 73a6745..ad8ee23 100644
--- a/common/m2/repository/com/android/external/eclipse/org-eclipse-equinox-common/3.6.0/BUILD
+++ b/common/m2/repository/com/android/external/eclipse/org-eclipse-equinox-common/3.6.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/android/external/eclipse/org-eclipse-jface/3.6.2/BUILD b/common/m2/repository/com/android/external/eclipse/org-eclipse-jface/3.6.2/BUILD
index a3248aa..25dd227 100644
--- a/common/m2/repository/com/android/external/eclipse/org-eclipse-jface/3.6.2/BUILD
+++ b/common/m2/repository/com/android/external/eclipse/org-eclipse-jface/3.6.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/android/external/eclipse/swt/3.5.0/BUILD b/common/m2/repository/com/android/external/eclipse/swt/3.5.0/BUILD
index 2170fa4..081df4b 100644
--- a/common/m2/repository/com/android/external/eclipse/swt/3.5.0/BUILD
+++ b/common/m2/repository/com/android/external/eclipse/swt/3.5.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/android/external/osgi/osgi/4.0.0/BUILD b/common/m2/repository/com/android/external/osgi/osgi/4.0.0/BUILD
index ea805a7..bbb66da 100644
--- a/common/m2/repository/com/android/external/osgi/osgi/4.0.0/BUILD
+++ b/common/m2/repository/com/android/external/osgi/osgi/4.0.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/android/tools/annotations/24.5.0/BUILD b/common/m2/repository/com/android/tools/annotations/24.5.0/BUILD
index b5c2fe7..193f192 100644
--- a/common/m2/repository/com/android/tools/annotations/24.5.0/BUILD
+++ b/common/m2/repository/com/android/tools/annotations/24.5.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/android/tools/annotations/25.0.0-beta2/BUILD b/common/m2/repository/com/android/tools/annotations/25.0.0-beta2/BUILD
index d28059d..65d29e9 100644
--- a/common/m2/repository/com/android/tools/annotations/25.0.0-beta2/BUILD
+++ b/common/m2/repository/com/android/tools/annotations/25.0.0-beta2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/android/tools/annotations/25.2.0/BUILD b/common/m2/repository/com/android/tools/annotations/25.2.0/BUILD
index e44d8c8..84a5936 100644
--- a/common/m2/repository/com/android/tools/annotations/25.2.0/BUILD
+++ b/common/m2/repository/com/android/tools/annotations/25.2.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/android/tools/build/builder-model/2.2.0/BUILD b/common/m2/repository/com/android/tools/build/builder-model/2.2.0/BUILD
index a4684aa..b2b6348 100644
--- a/common/m2/repository/com/android/tools/build/builder-model/2.2.0/BUILD
+++ b/common/m2/repository/com/android/tools/build/builder-model/2.2.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/android/tools/build/gradle-api/2.0.0-beta2/BUILD b/common/m2/repository/com/android/tools/build/gradle-api/2.0.0-beta2/BUILD
index e884b08..d4839eb 100644
--- a/common/m2/repository/com/android/tools/build/gradle-api/2.0.0-beta2/BUILD
+++ b/common/m2/repository/com/android/tools/build/gradle-api/2.0.0-beta2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/android/tools/build/gradle-api/2.2.0/BUILD b/common/m2/repository/com/android/tools/build/gradle-api/2.2.0/BUILD
index c65830b..84d51fc 100644
--- a/common/m2/repository/com/android/tools/build/gradle-api/2.2.0/BUILD
+++ b/common/m2/repository/com/android/tools/build/gradle-api/2.2.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/android/tools/build/transform-api/1.5.0/BUILD b/common/m2/repository/com/android/tools/build/transform-api/1.5.0/BUILD
index 6b33de3..ff79fd6 100644
--- a/common/m2/repository/com/android/tools/build/transform-api/1.5.0/BUILD
+++ b/common/m2/repository/com/android/tools/build/transform-api/1.5.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/android/tools/external/ant-glob/1.0/BUILD b/common/m2/repository/com/android/tools/external/ant-glob/1.0/BUILD
index 8027757..f64c951 100644
--- a/common/m2/repository/com/android/tools/external/ant-glob/1.0/BUILD
+++ b/common/m2/repository/com/android/tools/external/ant-glob/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/android/tools/external/com-intellij/uast/145.597.3/BUILD b/common/m2/repository/com/android/tools/external/com-intellij/uast/145.597.3/BUILD
index 0130649..4c530cb 100644
--- a/common/m2/repository/com/android/tools/external/com-intellij/uast/145.597.3/BUILD
+++ b/common/m2/repository/com/android/tools/external/com-intellij/uast/145.597.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/android/tools/external/liblzf/1.0/BUILD b/common/m2/repository/com/android/tools/external/liblzf/1.0/BUILD
index 470f6da..e38a80e 100644
--- a/common/m2/repository/com/android/tools/external/liblzf/1.0/BUILD
+++ b/common/m2/repository/com/android/tools/external/liblzf/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/android/tools/external/libprotobuf-java-lite/2.3.0/BUILD b/common/m2/repository/com/android/tools/external/libprotobuf-java-lite/2.3.0/BUILD
index 7dfd9f8..3b4ee48 100644
--- a/common/m2/repository/com/android/tools/external/libprotobuf-java-lite/2.3.0/BUILD
+++ b/common/m2/repository/com/android/tools/external/libprotobuf-java-lite/2.3.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/android/tools/external/lombok/lombok-ast/0.2.1/BUILD b/common/m2/repository/com/android/tools/external/lombok/lombok-ast/0.2.1/BUILD
index 75bce25..9994554 100644
--- a/common/m2/repository/com/android/tools/external/lombok/lombok-ast/0.2.1/BUILD
+++ b/common/m2/repository/com/android/tools/external/lombok/lombok-ast/0.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/android/tools/external/lombok/lombok-ast/0.2.2/BUILD b/common/m2/repository/com/android/tools/external/lombok/lombok-ast/0.2.2/BUILD
index 447723d..c28c592 100644
--- a/common/m2/repository/com/android/tools/external/lombok/lombok-ast/0.2.2/BUILD
+++ b/common/m2/repository/com/android/tools/external/lombok/lombok-ast/0.2.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/android/tools/external/lombok/lombok-ast/0.2.3/BUILD b/common/m2/repository/com/android/tools/external/lombok/lombok-ast/0.2.3/BUILD
index 81b6f26..bdbf447 100644
--- a/common/m2/repository/com/android/tools/external/lombok/lombok-ast/0.2.3/BUILD
+++ b/common/m2/repository/com/android/tools/external/lombok/lombok-ast/0.2.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/android/tools/external/propertysheet/1.0/BUILD b/common/m2/repository/com/android/tools/external/propertysheet/1.0/BUILD
index 0a36dc5..90a38c8 100644
--- a/common/m2/repository/com/android/tools/external/propertysheet/1.0/BUILD
+++ b/common/m2/repository/com/android/tools/external/propertysheet/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/android/tools/jack/jack-api/0.1/BUILD b/common/m2/repository/com/android/tools/jack/jack-api/0.1/BUILD
index 7788219..14ee177 100644
--- a/common/m2/repository/com/android/tools/jack/jack-api/0.1/BUILD
+++ b/common/m2/repository/com/android/tools/jack/jack-api/0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/android/tools/jack/jack-api/0.9.0/BUILD b/common/m2/repository/com/android/tools/jack/jack-api/0.9.0/BUILD
index 5079e00..5f98d49 100644
--- a/common/m2/repository/com/android/tools/jack/jack-api/0.9.0/BUILD
+++ b/common/m2/repository/com/android/tools/jack/jack-api/0.9.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/android/tools/jack/jill-api/0.1/BUILD b/common/m2/repository/com/android/tools/jack/jill-api/0.1/BUILD
index fbd33da..69f2c46 100644
--- a/common/m2/repository/com/android/tools/jack/jill-api/0.1/BUILD
+++ b/common/m2/repository/com/android/tools/jack/jill-api/0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/android/tools/jill/jill-api/0.9.0/BUILD b/common/m2/repository/com/android/tools/jill/jill-api/0.9.0/BUILD
index f1d10ac..c95a081 100644
--- a/common/m2/repository/com/android/tools/jill/jill-api/0.9.0/BUILD
+++ b/common/m2/repository/com/android/tools/jill/jill-api/0.9.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/apple/AppleJavaExtensions/1.4/BUILD b/common/m2/repository/com/apple/AppleJavaExtensions/1.4/BUILD
index 8e33a43..9c09257 100644
--- a/common/m2/repository/com/apple/AppleJavaExtensions/1.4/BUILD
+++ b/common/m2/repository/com/apple/AppleJavaExtensions/1.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/artemzin/rxjava/proguard-rules/1.1.0.0/BUILD b/common/m2/repository/com/artemzin/rxjava/proguard-rules/1.1.0.0/BUILD
index dacc468..d34bcd1 100644
--- a/common/m2/repository/com/artemzin/rxjava/proguard-rules/1.1.0.0/BUILD
+++ b/common/m2/repository/com/artemzin/rxjava/proguard-rules/1.1.0.0/BUILD
@@ -1,5 +1,12 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
+
+maven_aar(
+ name = "aar",
+ aar = "proguard-rules-1.1.0.0.aar",
+ pom = ":pom",
+ visibility = ["//visibility:public"],
+)
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/beust/jcommander/1.27/BUILD b/common/m2/repository/com/beust/jcommander/1.27/BUILD
index 5cd9138..b31484f 100644
--- a/common/m2/repository/com/beust/jcommander/1.27/BUILD
+++ b/common/m2/repository/com/beust/jcommander/1.27/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/beust/jcommander/1.48/BUILD b/common/m2/repository/com/beust/jcommander/1.48/BUILD
index d44a633..a879ef2 100644
--- a/common/m2/repository/com/beust/jcommander/1.48/BUILD
+++ b/common/m2/repository/com/beust/jcommander/1.48/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/cenqua/clover/clover/3.1.12/BUILD b/common/m2/repository/com/cenqua/clover/clover/3.1.12/BUILD
index 3cb3208..f48d50d 100644
--- a/common/m2/repository/com/cenqua/clover/clover/3.1.12/BUILD
+++ b/common/m2/repository/com/cenqua/clover/clover/3.1.12/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/fasterxml/jackson/core/jackson-core/2.1.3/BUILD b/common/m2/repository/com/fasterxml/jackson/core/jackson-core/2.1.3/BUILD
index 8b877f4..d9c16e4 100644
--- a/common/m2/repository/com/fasterxml/jackson/core/jackson-core/2.1.3/BUILD
+++ b/common/m2/repository/com/fasterxml/jackson/core/jackson-core/2.1.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/fasterxml/oss-parent/4/BUILD b/common/m2/repository/com/fasterxml/oss-parent/4/BUILD
index af03892..1e8c2f5 100644
--- a/common/m2/repository/com/fasterxml/oss-parent/4/BUILD
+++ b/common/m2/repository/com/fasterxml/oss-parent/4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/githang/viewpagerindicator/2.5/BUILD b/common/m2/repository/com/githang/viewpagerindicator/2.5/BUILD
index 97b6cc1..c02fc89 100644
--- a/common/m2/repository/com/githang/viewpagerindicator/2.5/BUILD
+++ b/common/m2/repository/com/githang/viewpagerindicator/2.5/BUILD
@@ -1,5 +1,12 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
+
+maven_aar(
+ name = "aar",
+ aar = "viewpagerindicator-2.5.aar",
+ pom = ":pom",
+ visibility = ["//visibility:public"],
+)
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/github/bumptech/glide/glide/3.6.1/BUILD b/common/m2/repository/com/github/bumptech/glide/glide/3.6.1/BUILD
index fad5a92..95eba0d 100644
--- a/common/m2/repository/com/github/bumptech/glide/glide/3.6.1/BUILD
+++ b/common/m2/repository/com/github/bumptech/glide/glide/3.6.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/github/bumptech/glide/okhttp-integration/1.3.1/BUILD b/common/m2/repository/com/github/bumptech/glide/okhttp-integration/1.3.1/BUILD
index 5c6872a..908e04e 100644
--- a/common/m2/repository/com/github/bumptech/glide/okhttp-integration/1.3.1/BUILD
+++ b/common/m2/repository/com/github/bumptech/glide/okhttp-integration/1.3.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/github/frankiesardo/auto-parcel-processor/0.3.1/BUILD b/common/m2/repository/com/github/frankiesardo/auto-parcel-processor/0.3.1/BUILD
index 7429815..cc4046e 100644
--- a/common/m2/repository/com/github/frankiesardo/auto-parcel-processor/0.3.1/BUILD
+++ b/common/m2/repository/com/github/frankiesardo/auto-parcel-processor/0.3.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/github/frankiesardo/auto-parcel/0.3.1/BUILD b/common/m2/repository/com/github/frankiesardo/auto-parcel/0.3.1/BUILD
index 10ba06d..ed84da7 100644
--- a/common/m2/repository/com/github/frankiesardo/auto-parcel/0.3.1/BUILD
+++ b/common/m2/repository/com/github/frankiesardo/auto-parcel/0.3.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/github/marschall/memoryfilesystem/0.6.4/BUILD b/common/m2/repository/com/github/marschall/memoryfilesystem/0.6.4/BUILD
index bd2408c..6b5260f 100644
--- a/common/m2/repository/com/github/marschall/memoryfilesystem/0.6.4/BUILD
+++ b/common/m2/repository/com/github/marschall/memoryfilesystem/0.6.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/android/android/4.0.1.2/BUILD b/common/m2/repository/com/google/android/android/4.0.1.2/BUILD
index 30e0c43..a39316b 100644
--- a/common/m2/repository/com/google/android/android/4.0.1.2/BUILD
+++ b/common/m2/repository/com/google/android/android/4.0.1.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/android/android/4.1.1.4/BUILD b/common/m2/repository/com/google/android/android/4.1.1.4/BUILD
index 97e3f91..6d16b10 100644
--- a/common/m2/repository/com/google/android/android/4.1.1.4/BUILD
+++ b/common/m2/repository/com/google/android/android/4.1.1.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/android/apps/common/testing/accessibility/framework/accessibility-test-framework/2.0/BUILD b/common/m2/repository/com/google/android/apps/common/testing/accessibility/framework/accessibility-test-framework/2.0/BUILD
index 1b54778..cbbea87 100644
--- a/common/m2/repository/com/google/android/apps/common/testing/accessibility/framework/accessibility-test-framework/2.0/BUILD
+++ b/common/m2/repository/com/google/android/apps/common/testing/accessibility/framework/accessibility-test-framework/2.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/android/apps/common/testing/accessibility/framework/accessibility-test-framework/2.1/BUILD b/common/m2/repository/com/google/android/apps/common/testing/accessibility/framework/accessibility-test-framework/2.1/BUILD
index 859066a..fa032de 100644
--- a/common/m2/repository/com/google/android/apps/common/testing/accessibility/framework/accessibility-test-framework/2.1/BUILD
+++ b/common/m2/repository/com/google/android/apps/common/testing/accessibility/framework/accessibility-test-framework/2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/api-client/google-api-client-parent/1.22.0/BUILD b/common/m2/repository/com/google/api-client/google-api-client-parent/1.22.0/BUILD
index 9f79364..de62a6a 100644
--- a/common/m2/repository/com/google/api-client/google-api-client-parent/1.22.0/BUILD
+++ b/common/m2/repository/com/google/api-client/google-api-client-parent/1.22.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/api-client/google-api-client/1.22.0/BUILD b/common/m2/repository/com/google/api-client/google-api-client/1.22.0/BUILD
index 3c1cfc4..69b1439 100644
--- a/common/m2/repository/com/google/api-client/google-api-client/1.22.0/BUILD
+++ b/common/m2/repository/com/google/api-client/google-api-client/1.22.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/apis/google-api-services-storage/v1-rev82-1.22.0/BUILD b/common/m2/repository/com/google/apis/google-api-services-storage/v1-rev82-1.22.0/BUILD
index 294c40e..e79c78f 100644
--- a/common/m2/repository/com/google/apis/google-api-services-storage/v1-rev82-1.22.0/BUILD
+++ b/common/m2/repository/com/google/apis/google-api-services-storage/v1-rev82-1.22.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/auth/google-auth-library-credentials/0.3.0/BUILD b/common/m2/repository/com/google/auth/google-auth-library-credentials/0.3.0/BUILD
index e9e8808..467027e 100644
--- a/common/m2/repository/com/google/auth/google-auth-library-credentials/0.3.0/BUILD
+++ b/common/m2/repository/com/google/auth/google-auth-library-credentials/0.3.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/auth/google-auth-library-credentials/0.4.0/BUILD b/common/m2/repository/com/google/auth/google-auth-library-credentials/0.4.0/BUILD
index 0cbf4a5..d073f85 100644
--- a/common/m2/repository/com/google/auth/google-auth-library-credentials/0.4.0/BUILD
+++ b/common/m2/repository/com/google/auth/google-auth-library-credentials/0.4.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/auth/google-auth-library-oauth2-http/0.3.0/BUILD b/common/m2/repository/com/google/auth/google-auth-library-oauth2-http/0.3.0/BUILD
index f75bd66..100694b 100644
--- a/common/m2/repository/com/google/auth/google-auth-library-oauth2-http/0.3.0/BUILD
+++ b/common/m2/repository/com/google/auth/google-auth-library-oauth2-http/0.3.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/auth/google-auth-library-parent/0.3.0/BUILD b/common/m2/repository/com/google/auth/google-auth-library-parent/0.3.0/BUILD
index b44d0b4..32d6e8a 100644
--- a/common/m2/repository/com/google/auth/google-auth-library-parent/0.3.0/BUILD
+++ b/common/m2/repository/com/google/auth/google-auth-library-parent/0.3.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/auth/google-auth-library-parent/0.4.0/BUILD b/common/m2/repository/com/google/auth/google-auth-library-parent/0.4.0/BUILD
index 6b9af2c..5c25745 100644
--- a/common/m2/repository/com/google/auth/google-auth-library-parent/0.4.0/BUILD
+++ b/common/m2/repository/com/google/auth/google-auth-library-parent/0.4.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/auto/auto-common/0.3/BUILD b/common/m2/repository/com/google/auto/auto-common/0.3/BUILD
index b9176d8..1fc5019 100644
--- a/common/m2/repository/com/google/auto/auto-common/0.3/BUILD
+++ b/common/m2/repository/com/google/auto/auto-common/0.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/auto/auto-common/0.4/BUILD b/common/m2/repository/com/google/auto/auto-common/0.4/BUILD
index f3c4be3..67a39e0 100644
--- a/common/m2/repository/com/google/auto/auto-common/0.4/BUILD
+++ b/common/m2/repository/com/google/auto/auto-common/0.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/auto/auto-common/0.6/BUILD b/common/m2/repository/com/google/auto/auto-common/0.6/BUILD
index f3a4cb0..7ad8d9b 100644
--- a/common/m2/repository/com/google/auto/auto-common/0.6/BUILD
+++ b/common/m2/repository/com/google/auto/auto-common/0.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/auto/auto-parent/2/BUILD b/common/m2/repository/com/google/auto/auto-parent/2/BUILD
index bfc6b8c..a8093b7 100644
--- a/common/m2/repository/com/google/auto/auto-parent/2/BUILD
+++ b/common/m2/repository/com/google/auto/auto-parent/2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/auto/auto-parent/3/BUILD b/common/m2/repository/com/google/auto/auto-parent/3/BUILD
index 0984a15..58a89a1 100644
--- a/common/m2/repository/com/google/auto/auto-parent/3/BUILD
+++ b/common/m2/repository/com/google/auto/auto-parent/3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/auto/factory/auto-factory/1.0-beta2/BUILD b/common/m2/repository/com/google/auto/factory/auto-factory/1.0-beta2/BUILD
index d469073..e54a372 100644
--- a/common/m2/repository/com/google/auto/factory/auto-factory/1.0-beta2/BUILD
+++ b/common/m2/repository/com/google/auto/factory/auto-factory/1.0-beta2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/auto/service/auto-service/1.0-rc2/BUILD b/common/m2/repository/com/google/auto/service/auto-service/1.0-rc2/BUILD
index 6f53994..8ac9765 100644
--- a/common/m2/repository/com/google/auto/service/auto-service/1.0-rc2/BUILD
+++ b/common/m2/repository/com/google/auto/service/auto-service/1.0-rc2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/auto/value/auto-value/1.0/BUILD b/common/m2/repository/com/google/auto/value/auto-value/1.0/BUILD
index 206beeb..82f0751 100644
--- a/common/m2/repository/com/google/auto/value/auto-value/1.0/BUILD
+++ b/common/m2/repository/com/google/auto/value/auto-value/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/code/findbugs/annotations/2.0.1/BUILD b/common/m2/repository/com/google/code/findbugs/annotations/2.0.1/BUILD
index 154db4c..0a3aecc 100644
--- a/common/m2/repository/com/google/code/findbugs/annotations/2.0.1/BUILD
+++ b/common/m2/repository/com/google/code/findbugs/annotations/2.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/code/findbugs/annotations/3.0.0/BUILD b/common/m2/repository/com/google/code/findbugs/annotations/3.0.0/BUILD
index 6e5bbc5..a1c6150 100644
--- a/common/m2/repository/com/google/code/findbugs/annotations/3.0.0/BUILD
+++ b/common/m2/repository/com/google/code/findbugs/annotations/3.0.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/code/findbugs/bcel-findbugs/6.0/BUILD b/common/m2/repository/com/google/code/findbugs/bcel-findbugs/6.0/BUILD
index 59ee210..47354b7 100644
--- a/common/m2/repository/com/google/code/findbugs/bcel-findbugs/6.0/BUILD
+++ b/common/m2/repository/com/google/code/findbugs/bcel-findbugs/6.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/code/findbugs/bcel/2.0.1/BUILD b/common/m2/repository/com/google/code/findbugs/bcel/2.0.1/BUILD
index 13605c4..5c94170 100644
--- a/common/m2/repository/com/google/code/findbugs/bcel/2.0.1/BUILD
+++ b/common/m2/repository/com/google/code/findbugs/bcel/2.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/code/findbugs/findbugs/2.0.1/BUILD b/common/m2/repository/com/google/code/findbugs/findbugs/2.0.1/BUILD
index 79c4f3e..320682a 100644
--- a/common/m2/repository/com/google/code/findbugs/findbugs/2.0.1/BUILD
+++ b/common/m2/repository/com/google/code/findbugs/findbugs/2.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/code/findbugs/findbugs/2.0.3/BUILD b/common/m2/repository/com/google/code/findbugs/findbugs/2.0.3/BUILD
index 1e570c4..e203913 100644
--- a/common/m2/repository/com/google/code/findbugs/findbugs/2.0.3/BUILD
+++ b/common/m2/repository/com/google/code/findbugs/findbugs/2.0.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/code/findbugs/findbugs/3.0.0/BUILD b/common/m2/repository/com/google/code/findbugs/findbugs/3.0.0/BUILD
index f484c61..b007a2b 100644
--- a/common/m2/repository/com/google/code/findbugs/findbugs/3.0.0/BUILD
+++ b/common/m2/repository/com/google/code/findbugs/findbugs/3.0.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/code/findbugs/jFormatString/2.0.1/BUILD b/common/m2/repository/com/google/code/findbugs/jFormatString/2.0.1/BUILD
index 21192ab..e4e46b9 100644
--- a/common/m2/repository/com/google/code/findbugs/jFormatString/2.0.1/BUILD
+++ b/common/m2/repository/com/google/code/findbugs/jFormatString/2.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/code/findbugs/jFormatString/3.0.0/BUILD b/common/m2/repository/com/google/code/findbugs/jFormatString/3.0.0/BUILD
index 0980c05..609505c 100644
--- a/common/m2/repository/com/google/code/findbugs/jFormatString/3.0.0/BUILD
+++ b/common/m2/repository/com/google/code/findbugs/jFormatString/3.0.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/code/findbugs/jsr305/1.3.9/BUILD b/common/m2/repository/com/google/code/findbugs/jsr305/1.3.9/BUILD
index 0dc5544..c100237 100644
--- a/common/m2/repository/com/google/code/findbugs/jsr305/1.3.9/BUILD
+++ b/common/m2/repository/com/google/code/findbugs/jsr305/1.3.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/code/findbugs/jsr305/2.0.1/BUILD b/common/m2/repository/com/google/code/findbugs/jsr305/2.0.1/BUILD
index 271f140..c6f3914 100644
--- a/common/m2/repository/com/google/code/findbugs/jsr305/2.0.1/BUILD
+++ b/common/m2/repository/com/google/code/findbugs/jsr305/2.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/code/findbugs/jsr305/2.0.2/BUILD b/common/m2/repository/com/google/code/findbugs/jsr305/2.0.2/BUILD
index 841f1d0..e378c55 100644
--- a/common/m2/repository/com/google/code/findbugs/jsr305/2.0.2/BUILD
+++ b/common/m2/repository/com/google/code/findbugs/jsr305/2.0.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/code/findbugs/jsr305/2.0.3/BUILD b/common/m2/repository/com/google/code/findbugs/jsr305/2.0.3/BUILD
index e7075e9..0bd7451 100644
--- a/common/m2/repository/com/google/code/findbugs/jsr305/2.0.3/BUILD
+++ b/common/m2/repository/com/google/code/findbugs/jsr305/2.0.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/code/findbugs/jsr305/3.0.0/BUILD b/common/m2/repository/com/google/code/findbugs/jsr305/3.0.0/BUILD
index 5e86b6c..5a1affe 100644
--- a/common/m2/repository/com/google/code/findbugs/jsr305/3.0.0/BUILD
+++ b/common/m2/repository/com/google/code/findbugs/jsr305/3.0.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/code/findbugs/jsr305/3.0.1/BUILD b/common/m2/repository/com/google/code/findbugs/jsr305/3.0.1/BUILD
index ed39b42..2179e8d 100644
--- a/common/m2/repository/com/google/code/findbugs/jsr305/3.0.1/BUILD
+++ b/common/m2/repository/com/google/code/findbugs/jsr305/3.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/code/gson/gson/2.2.4/BUILD b/common/m2/repository/com/google/code/gson/gson/2.2.4/BUILD
index 427e942..b6abafc 100644
--- a/common/m2/repository/com/google/code/gson/gson/2.2.4/BUILD
+++ b/common/m2/repository/com/google/code/gson/gson/2.2.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/code/gson/gson/2.3/BUILD b/common/m2/repository/com/google/code/gson/gson/2.3/BUILD
index ebb6d53..91048e9 100644
--- a/common/m2/repository/com/google/code/gson/gson/2.3/BUILD
+++ b/common/m2/repository/com/google/code/gson/gson/2.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/collections/google-collections/1.0/BUILD b/common/m2/repository/com/google/collections/google-collections/1.0/BUILD
index b12c5aa..f679e30 100644
--- a/common/m2/repository/com/google/collections/google-collections/1.0/BUILD
+++ b/common/m2/repository/com/google/collections/google-collections/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/dagger/dagger-compiler/2.0/BUILD b/common/m2/repository/com/google/dagger/dagger-compiler/2.0/BUILD
index 73b842a..0169922 100644
--- a/common/m2/repository/com/google/dagger/dagger-compiler/2.0/BUILD
+++ b/common/m2/repository/com/google/dagger/dagger-compiler/2.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/dagger/dagger-compiler/2.6/BUILD b/common/m2/repository/com/google/dagger/dagger-compiler/2.6/BUILD
index 5ae2c7b..a609c2f 100644
--- a/common/m2/repository/com/google/dagger/dagger-compiler/2.6/BUILD
+++ b/common/m2/repository/com/google/dagger/dagger-compiler/2.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/dagger/dagger-parent/2.0/BUILD b/common/m2/repository/com/google/dagger/dagger-parent/2.0/BUILD
index 0568c63..e357998 100644
--- a/common/m2/repository/com/google/dagger/dagger-parent/2.0/BUILD
+++ b/common/m2/repository/com/google/dagger/dagger-parent/2.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/dagger/dagger-parent/2.6/BUILD b/common/m2/repository/com/google/dagger/dagger-parent/2.6/BUILD
index 8be238d..5f98f97 100644
--- a/common/m2/repository/com/google/dagger/dagger-parent/2.6/BUILD
+++ b/common/m2/repository/com/google/dagger/dagger-parent/2.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/dagger/dagger-producers/2.0-beta/BUILD b/common/m2/repository/com/google/dagger/dagger-producers/2.0-beta/BUILD
index eec216e..a481567 100644
--- a/common/m2/repository/com/google/dagger/dagger-producers/2.0-beta/BUILD
+++ b/common/m2/repository/com/google/dagger/dagger-producers/2.0-beta/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/dagger/dagger-producers/2.6/BUILD b/common/m2/repository/com/google/dagger/dagger-producers/2.6/BUILD
index eeed852..4c43fda 100644
--- a/common/m2/repository/com/google/dagger/dagger-producers/2.6/BUILD
+++ b/common/m2/repository/com/google/dagger/dagger-producers/2.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/dagger/dagger/2.0/BUILD b/common/m2/repository/com/google/dagger/dagger/2.0/BUILD
index a27b4a0..d23e2f8 100644
--- a/common/m2/repository/com/google/dagger/dagger/2.0/BUILD
+++ b/common/m2/repository/com/google/dagger/dagger/2.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/dagger/dagger/2.6/BUILD b/common/m2/repository/com/google/dagger/dagger/2.6/BUILD
index 231f0e0..3a9f0a0 100644
--- a/common/m2/repository/com/google/dagger/dagger/2.6/BUILD
+++ b/common/m2/repository/com/google/dagger/dagger/2.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/dexmaker/dexmaker-mockito/1.0/BUILD b/common/m2/repository/com/google/dexmaker/dexmaker-mockito/1.0/BUILD
index 8db128c..8d8a931 100644
--- a/common/m2/repository/com/google/dexmaker/dexmaker-mockito/1.0/BUILD
+++ b/common/m2/repository/com/google/dexmaker/dexmaker-mockito/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/dexmaker/dexmaker-mockito/1.2/BUILD b/common/m2/repository/com/google/dexmaker/dexmaker-mockito/1.2/BUILD
index 1f3425c..b09f308 100644
--- a/common/m2/repository/com/google/dexmaker/dexmaker-mockito/1.2/BUILD
+++ b/common/m2/repository/com/google/dexmaker/dexmaker-mockito/1.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/dexmaker/dexmaker-parent/1.0/BUILD b/common/m2/repository/com/google/dexmaker/dexmaker-parent/1.0/BUILD
index 5c6a055..891a2cc 100644
--- a/common/m2/repository/com/google/dexmaker/dexmaker-parent/1.0/BUILD
+++ b/common/m2/repository/com/google/dexmaker/dexmaker-parent/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/dexmaker/dexmaker-parent/1.2/BUILD b/common/m2/repository/com/google/dexmaker/dexmaker-parent/1.2/BUILD
index 7ddc126..94cb262 100644
--- a/common/m2/repository/com/google/dexmaker/dexmaker-parent/1.2/BUILD
+++ b/common/m2/repository/com/google/dexmaker/dexmaker-parent/1.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/dexmaker/dexmaker/1.0/BUILD b/common/m2/repository/com/google/dexmaker/dexmaker/1.0/BUILD
index a13bb91..6cc8272 100644
--- a/common/m2/repository/com/google/dexmaker/dexmaker/1.0/BUILD
+++ b/common/m2/repository/com/google/dexmaker/dexmaker/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/dexmaker/dexmaker/1.2/BUILD b/common/m2/repository/com/google/dexmaker/dexmaker/1.2/BUILD
index af18a21..c408493 100644
--- a/common/m2/repository/com/google/dexmaker/dexmaker/1.2/BUILD
+++ b/common/m2/repository/com/google/dexmaker/dexmaker/1.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/errorprone/error_prone_annotations/2.0.2/BUILD b/common/m2/repository/com/google/errorprone/error_prone_annotations/2.0.2/BUILD
index af657bc..ffda3a6 100644
--- a/common/m2/repository/com/google/errorprone/error_prone_annotations/2.0.2/BUILD
+++ b/common/m2/repository/com/google/errorprone/error_prone_annotations/2.0.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/errorprone/error_prone_parent/2.0.2/BUILD b/common/m2/repository/com/google/errorprone/error_prone_parent/2.0.2/BUILD
index bc0c404..eba9c0f 100644
--- a/common/m2/repository/com/google/errorprone/error_prone_parent/2.0.2/BUILD
+++ b/common/m2/repository/com/google/errorprone/error_prone_parent/2.0.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/google/1/BUILD b/common/m2/repository/com/google/google/1/BUILD
index be98453..a3896aa 100644
--- a/common/m2/repository/com/google/google/1/BUILD
+++ b/common/m2/repository/com/google/google/1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/gradle/osdetector-gradle-plugin/1.2.1/BUILD b/common/m2/repository/com/google/gradle/osdetector-gradle-plugin/1.2.1/BUILD
index 0c1b5f2..3ada84b 100644
--- a/common/m2/repository/com/google/gradle/osdetector-gradle-plugin/1.2.1/BUILD
+++ b/common/m2/repository/com/google/gradle/osdetector-gradle-plugin/1.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/gradle/osdetector-gradle-plugin/1.4.0/BUILD b/common/m2/repository/com/google/gradle/osdetector-gradle-plugin/1.4.0/BUILD
index 339c617..476be0a 100644
--- a/common/m2/repository/com/google/gradle/osdetector-gradle-plugin/1.4.0/BUILD
+++ b/common/m2/repository/com/google/gradle/osdetector-gradle-plugin/1.4.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/guava/guava-jdk5/17.0/BUILD b/common/m2/repository/com/google/guava/guava-jdk5/17.0/BUILD
index c0197bf..15b0e3e 100644
--- a/common/m2/repository/com/google/guava/guava-jdk5/17.0/BUILD
+++ b/common/m2/repository/com/google/guava/guava-jdk5/17.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/guava/guava-parent-jdk5/17.0/BUILD b/common/m2/repository/com/google/guava/guava-parent-jdk5/17.0/BUILD
index 57a2b8a..c13aa56 100644
--- a/common/m2/repository/com/google/guava/guava-parent-jdk5/17.0/BUILD
+++ b/common/m2/repository/com/google/guava/guava-parent-jdk5/17.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/guava/guava-parent/10.0.1/BUILD b/common/m2/repository/com/google/guava/guava-parent/10.0.1/BUILD
index aeda101..62177be 100644
--- a/common/m2/repository/com/google/guava/guava-parent/10.0.1/BUILD
+++ b/common/m2/repository/com/google/guava/guava-parent/10.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/guava/guava-parent/13.0.1/BUILD b/common/m2/repository/com/google/guava/guava-parent/13.0.1/BUILD
index e4945df..c948e72 100644
--- a/common/m2/repository/com/google/guava/guava-parent/13.0.1/BUILD
+++ b/common/m2/repository/com/google/guava/guava-parent/13.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/guava/guava-parent/15.0/BUILD b/common/m2/repository/com/google/guava/guava-parent/15.0/BUILD
index 0152cba..066776e 100644
--- a/common/m2/repository/com/google/guava/guava-parent/15.0/BUILD
+++ b/common/m2/repository/com/google/guava/guava-parent/15.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/guava/guava-parent/17.0/BUILD b/common/m2/repository/com/google/guava/guava-parent/17.0/BUILD
index 3e83699..552ea4c 100644
--- a/common/m2/repository/com/google/guava/guava-parent/17.0/BUILD
+++ b/common/m2/repository/com/google/guava/guava-parent/17.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/guava/guava-parent/18.0/BUILD b/common/m2/repository/com/google/guava/guava-parent/18.0/BUILD
index b0a9d2d..ae4ace5 100644
--- a/common/m2/repository/com/google/guava/guava-parent/18.0/BUILD
+++ b/common/m2/repository/com/google/guava/guava-parent/18.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/guava/guava-parent/19.0-rc2/BUILD b/common/m2/repository/com/google/guava/guava-parent/19.0-rc2/BUILD
index ed22577..8193711 100644
--- a/common/m2/repository/com/google/guava/guava-parent/19.0-rc2/BUILD
+++ b/common/m2/repository/com/google/guava/guava-parent/19.0-rc2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/guava/guava-parent/19.0/BUILD b/common/m2/repository/com/google/guava/guava-parent/19.0/BUILD
index 07d8725..7cde2d2 100644
--- a/common/m2/repository/com/google/guava/guava-parent/19.0/BUILD
+++ b/common/m2/repository/com/google/guava/guava-parent/19.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/guava/guava/10.0.1/BUILD b/common/m2/repository/com/google/guava/guava/10.0.1/BUILD
index 71dce8d..9abd51c 100644
--- a/common/m2/repository/com/google/guava/guava/10.0.1/BUILD
+++ b/common/m2/repository/com/google/guava/guava/10.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/guava/guava/13.0.1/BUILD b/common/m2/repository/com/google/guava/guava/13.0.1/BUILD
index fb36e80..0a583a1 100644
--- a/common/m2/repository/com/google/guava/guava/13.0.1/BUILD
+++ b/common/m2/repository/com/google/guava/guava/13.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/guava/guava/15.0/BUILD b/common/m2/repository/com/google/guava/guava/15.0/BUILD
index 2ca66e6..661c7da 100644
--- a/common/m2/repository/com/google/guava/guava/15.0/BUILD
+++ b/common/m2/repository/com/google/guava/guava/15.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/guava/guava/17.0/BUILD b/common/m2/repository/com/google/guava/guava/17.0/BUILD
index d7b5e01..eced6dc 100644
--- a/common/m2/repository/com/google/guava/guava/17.0/BUILD
+++ b/common/m2/repository/com/google/guava/guava/17.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/guava/guava/19.0-rc2/BUILD b/common/m2/repository/com/google/guava/guava/19.0-rc2/BUILD
index 334a2cf..bdca45e 100644
--- a/common/m2/repository/com/google/guava/guava/19.0-rc2/BUILD
+++ b/common/m2/repository/com/google/guava/guava/19.0-rc2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/guava/guava/19.0/BUILD b/common/m2/repository/com/google/guava/guava/19.0/BUILD
index 1e780fd..e4bfc9e 100644
--- a/common/m2/repository/com/google/guava/guava/19.0/BUILD
+++ b/common/m2/repository/com/google/guava/guava/19.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/http-client/google-http-client-jackson2/1.19.0/BUILD b/common/m2/repository/com/google/http-client/google-http-client-jackson2/1.19.0/BUILD
index f046d5d..f403642 100644
--- a/common/m2/repository/com/google/http-client/google-http-client-jackson2/1.19.0/BUILD
+++ b/common/m2/repository/com/google/http-client/google-http-client-jackson2/1.19.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/http-client/google-http-client-jackson2/1.22.0/BUILD b/common/m2/repository/com/google/http-client/google-http-client-jackson2/1.22.0/BUILD
index 2fb83f1..fe9583e 100644
--- a/common/m2/repository/com/google/http-client/google-http-client-jackson2/1.22.0/BUILD
+++ b/common/m2/repository/com/google/http-client/google-http-client-jackson2/1.22.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/http-client/google-http-client-parent/1.19.0/BUILD b/common/m2/repository/com/google/http-client/google-http-client-parent/1.19.0/BUILD
index a8d5e7b..dc9bcee 100644
--- a/common/m2/repository/com/google/http-client/google-http-client-parent/1.19.0/BUILD
+++ b/common/m2/repository/com/google/http-client/google-http-client-parent/1.19.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/http-client/google-http-client-parent/1.22.0/BUILD b/common/m2/repository/com/google/http-client/google-http-client-parent/1.22.0/BUILD
index 1c6be96..907ad8a 100644
--- a/common/m2/repository/com/google/http-client/google-http-client-parent/1.22.0/BUILD
+++ b/common/m2/repository/com/google/http-client/google-http-client-parent/1.22.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/http-client/google-http-client/1.19.0/BUILD b/common/m2/repository/com/google/http-client/google-http-client/1.19.0/BUILD
index 00c150e..7e631db 100644
--- a/common/m2/repository/com/google/http-client/google-http-client/1.19.0/BUILD
+++ b/common/m2/repository/com/google/http-client/google-http-client/1.19.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/http-client/google-http-client/1.22.0/BUILD b/common/m2/repository/com/google/http-client/google-http-client/1.22.0/BUILD
index b39bec6..0a09f7e 100644
--- a/common/m2/repository/com/google/http-client/google-http-client/1.22.0/BUILD
+++ b/common/m2/repository/com/google/http-client/google-http-client/1.22.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/jimfs/jimfs-parent/1.1/BUILD b/common/m2/repository/com/google/jimfs/jimfs-parent/1.1/BUILD
index b945fd5..83708f2 100644
--- a/common/m2/repository/com/google/jimfs/jimfs-parent/1.1/BUILD
+++ b/common/m2/repository/com/google/jimfs/jimfs-parent/1.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/jimfs/jimfs/1.1/BUILD b/common/m2/repository/com/google/jimfs/jimfs/1.1/BUILD
index 2df2d96..3f90c38 100644
--- a/common/m2/repository/com/google/jimfs/jimfs/1.1/BUILD
+++ b/common/m2/repository/com/google/jimfs/jimfs/1.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/jsilver/jsilver/1.0.0/BUILD b/common/m2/repository/com/google/jsilver/jsilver/1.0.0/BUILD
index 7db035f..f82e8b4 100644
--- a/common/m2/repository/com/google/jsilver/jsilver/1.0.0/BUILD
+++ b/common/m2/repository/com/google/jsilver/jsilver/1.0.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/oauth-client/google-oauth-client-parent/1.22.0/BUILD b/common/m2/repository/com/google/oauth-client/google-oauth-client-parent/1.22.0/BUILD
index 106cb81..2f32c89 100644
--- a/common/m2/repository/com/google/oauth-client/google-oauth-client-parent/1.22.0/BUILD
+++ b/common/m2/repository/com/google/oauth-client/google-oauth-client-parent/1.22.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/oauth-client/google-oauth-client/1.22.0/BUILD b/common/m2/repository/com/google/oauth-client/google-oauth-client/1.22.0/BUILD
index 1b91493..6878406 100644
--- a/common/m2/repository/com/google/oauth-client/google-oauth-client/1.22.0/BUILD
+++ b/common/m2/repository/com/google/oauth-client/google-oauth-client/1.22.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/protobuf/nano/protobuf-javanano/3.0.0-alpha-5/BUILD b/common/m2/repository/com/google/protobuf/nano/protobuf-javanano/3.0.0-alpha-5/BUILD
index 97cbce2..44ee2b0 100644
--- a/common/m2/repository/com/google/protobuf/nano/protobuf-javanano/3.0.0-alpha-5/BUILD
+++ b/common/m2/repository/com/google/protobuf/nano/protobuf-javanano/3.0.0-alpha-5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/protobuf/protobuf-gradle-plugin/0.7.5/BUILD b/common/m2/repository/com/google/protobuf/protobuf-gradle-plugin/0.7.5/BUILD
index 51aec74..b52068b 100644
--- a/common/m2/repository/com/google/protobuf/protobuf-gradle-plugin/0.7.5/BUILD
+++ b/common/m2/repository/com/google/protobuf/protobuf-gradle-plugin/0.7.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/protobuf/protobuf-gradle-plugin/0.7.7/BUILD b/common/m2/repository/com/google/protobuf/protobuf-gradle-plugin/0.7.7/BUILD
index d3709c4..5e46dfa 100644
--- a/common/m2/repository/com/google/protobuf/protobuf-gradle-plugin/0.7.7/BUILD
+++ b/common/m2/repository/com/google/protobuf/protobuf-gradle-plugin/0.7.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/protobuf/protobuf-gradle-plugin/0.8.0/BUILD b/common/m2/repository/com/google/protobuf/protobuf-gradle-plugin/0.8.0/BUILD
index 8acd4e9..332709b 100644
--- a/common/m2/repository/com/google/protobuf/protobuf-gradle-plugin/0.8.0/BUILD
+++ b/common/m2/repository/com/google/protobuf/protobuf-gradle-plugin/0.8.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/protobuf/protobuf-java-util/3.0.0/BUILD b/common/m2/repository/com/google/protobuf/protobuf-java-util/3.0.0/BUILD
index 6f08c23..e5112b9 100644
--- a/common/m2/repository/com/google/protobuf/protobuf-java-util/3.0.0/BUILD
+++ b/common/m2/repository/com/google/protobuf/protobuf-java-util/3.0.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/protobuf/protobuf-java/2.5.0/BUILD b/common/m2/repository/com/google/protobuf/protobuf-java/2.5.0/BUILD
index 5a36f91..2161082 100644
--- a/common/m2/repository/com/google/protobuf/protobuf-java/2.5.0/BUILD
+++ b/common/m2/repository/com/google/protobuf/protobuf-java/2.5.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/protobuf/protobuf-java/2.6.1/BUILD b/common/m2/repository/com/google/protobuf/protobuf-java/2.6.1/BUILD
index 68a45ad..88d0924 100644
--- a/common/m2/repository/com/google/protobuf/protobuf-java/2.6.1/BUILD
+++ b/common/m2/repository/com/google/protobuf/protobuf-java/2.6.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/protobuf/protobuf-java/3.0.0-beta-2/BUILD b/common/m2/repository/com/google/protobuf/protobuf-java/3.0.0-beta-2/BUILD
index b32bdae..07be0da 100644
--- a/common/m2/repository/com/google/protobuf/protobuf-java/3.0.0-beta-2/BUILD
+++ b/common/m2/repository/com/google/protobuf/protobuf-java/3.0.0-beta-2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/protobuf/protobuf-java/3.0.0/BUILD b/common/m2/repository/com/google/protobuf/protobuf-java/3.0.0/BUILD
index 2f6f1fb..3d3226d 100644
--- a/common/m2/repository/com/google/protobuf/protobuf-java/3.0.0/BUILD
+++ b/common/m2/repository/com/google/protobuf/protobuf-java/3.0.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/protobuf/protobuf-lite/3.0.1/BUILD b/common/m2/repository/com/google/protobuf/protobuf-lite/3.0.1/BUILD
index e12ca7d..7a026be 100644
--- a/common/m2/repository/com/google/protobuf/protobuf-lite/3.0.1/BUILD
+++ b/common/m2/repository/com/google/protobuf/protobuf-lite/3.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/protobuf/protobuf-parent/3.0.0/BUILD b/common/m2/repository/com/google/protobuf/protobuf-parent/3.0.0/BUILD
index bb0c37a..61564a0 100644
--- a/common/m2/repository/com/google/protobuf/protobuf-parent/3.0.0/BUILD
+++ b/common/m2/repository/com/google/protobuf/protobuf-parent/3.0.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/protobuf/protoc/3.0.0-beta-2/BUILD b/common/m2/repository/com/google/protobuf/protoc/3.0.0-beta-2/BUILD
index 12c0873..4002735 100644
--- a/common/m2/repository/com/google/protobuf/protoc/3.0.0-beta-2/BUILD
+++ b/common/m2/repository/com/google/protobuf/protoc/3.0.0-beta-2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/protobuf/protoc/3.0.0/BUILD b/common/m2/repository/com/google/protobuf/protoc/3.0.0/BUILD
index c91ddb7..0154b5c 100644
--- a/common/m2/repository/com/google/protobuf/protoc/3.0.0/BUILD
+++ b/common/m2/repository/com/google/protobuf/protoc/3.0.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/testing/compile/compile-testing/0.9/BUILD b/common/m2/repository/com/google/testing/compile/compile-testing/0.9/BUILD
index d8bc910..805d88f 100644
--- a/common/m2/repository/com/google/testing/compile/compile-testing/0.9/BUILD
+++ b/common/m2/repository/com/google/testing/compile/compile-testing/0.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/truth/truth-parent/0.24/BUILD b/common/m2/repository/com/google/truth/truth-parent/0.24/BUILD
index c82b5bd..26599b9 100644
--- a/common/m2/repository/com/google/truth/truth-parent/0.24/BUILD
+++ b/common/m2/repository/com/google/truth/truth-parent/0.24/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/truth/truth-parent/0.26/BUILD b/common/m2/repository/com/google/truth/truth-parent/0.26/BUILD
index 13638a1..e23b714 100644
--- a/common/m2/repository/com/google/truth/truth-parent/0.26/BUILD
+++ b/common/m2/repository/com/google/truth/truth-parent/0.26/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/truth/truth-parent/0.28/BUILD b/common/m2/repository/com/google/truth/truth-parent/0.28/BUILD
index 1709697..6be9e3f 100644
--- a/common/m2/repository/com/google/truth/truth-parent/0.28/BUILD
+++ b/common/m2/repository/com/google/truth/truth-parent/0.28/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/google/truth/truth/0.24/BUILD b/common/m2/repository/com/google/truth/truth/0.24/BUILD
index 3b6dc3e..74368b8 100644
--- a/common/m2/repository/com/google/truth/truth/0.24/BUILD
+++ b/common/m2/repository/com/google/truth/truth/0.24/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/truth/truth/0.26/BUILD b/common/m2/repository/com/google/truth/truth/0.26/BUILD
index 9fe4362..bf0cb2f 100644
--- a/common/m2/repository/com/google/truth/truth/0.26/BUILD
+++ b/common/m2/repository/com/google/truth/truth/0.26/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/google/truth/truth/0.28/BUILD b/common/m2/repository/com/google/truth/truth/0.28/BUILD
index 2c16106..c1cbbaf 100644
--- a/common/m2/repository/com/google/truth/truth/0.28/BUILD
+++ b/common/m2/repository/com/google/truth/truth/0.28/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/googlecode/jarjar/jarjar/1.3/BUILD b/common/m2/repository/com/googlecode/jarjar/jarjar/1.3/BUILD
index c663e84..f7d5f73 100644
--- a/common/m2/repository/com/googlecode/jarjar/jarjar/1.3/BUILD
+++ b/common/m2/repository/com/googlecode/jarjar/jarjar/1.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/googlecode/juniversalchardet/juniversalchardet/1.0.3/BUILD b/common/m2/repository/com/googlecode/juniversalchardet/juniversalchardet/1.0.3/BUILD
index 8b3c0d3..21908ec 100644
--- a/common/m2/repository/com/googlecode/juniversalchardet/juniversalchardet/1.0.3/BUILD
+++ b/common/m2/repository/com/googlecode/juniversalchardet/juniversalchardet/1.0.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/ibm/icu/icu4j/2.6.1/BUILD b/common/m2/repository/com/ibm/icu/icu4j/2.6.1/BUILD
index b45c5a9..4582877 100644
--- a/common/m2/repository/com/ibm/icu/icu4j/2.6.1/BUILD
+++ b/common/m2/repository/com/ibm/icu/icu4j/2.6.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/ibm/icu/icu4j/53.1/BUILD b/common/m2/repository/com/ibm/icu/icu4j/53.1/BUILD
index 7ae00ac..9dde07b 100644
--- a/common/m2/repository/com/ibm/icu/icu4j/53.1/BUILD
+++ b/common/m2/repository/com/ibm/icu/icu4j/53.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/ibm/icu/icu4j/54.1.1/BUILD b/common/m2/repository/com/ibm/icu/icu4j/54.1.1/BUILD
index 624e9cd..b84d49b 100644
--- a/common/m2/repository/com/ibm/icu/icu4j/54.1.1/BUILD
+++ b/common/m2/repository/com/ibm/icu/icu4j/54.1.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/intellij/annotations/12.0/BUILD b/common/m2/repository/com/intellij/annotations/12.0/BUILD
index e09cacf..3021958 100644
--- a/common/m2/repository/com/intellij/annotations/12.0/BUILD
+++ b/common/m2/repository/com/intellij/annotations/12.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/jakewharton/butterknife-parent/7.0.1/BUILD b/common/m2/repository/com/jakewharton/butterknife-parent/7.0.1/BUILD
index 4352415..e301259 100644
--- a/common/m2/repository/com/jakewharton/butterknife-parent/7.0.1/BUILD
+++ b/common/m2/repository/com/jakewharton/butterknife-parent/7.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/jakewharton/butterknife/7.0.1/BUILD b/common/m2/repository/com/jakewharton/butterknife/7.0.1/BUILD
index 3112bc8..cd133ac 100644
--- a/common/m2/repository/com/jakewharton/butterknife/7.0.1/BUILD
+++ b/common/m2/repository/com/jakewharton/butterknife/7.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/jfrog/bintray/gradle/gradle-bintray-plugin/1.0/BUILD b/common/m2/repository/com/jfrog/bintray/gradle/gradle-bintray-plugin/1.0/BUILD
index ed370e9..a22ea2a 100644
--- a/common/m2/repository/com/jfrog/bintray/gradle/gradle-bintray-plugin/1.0/BUILD
+++ b/common/m2/repository/com/jfrog/bintray/gradle/gradle-bintray-plugin/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/jfrog/bintray/gradle/gradle-bintray-plugin/1.2/BUILD b/common/m2/repository/com/jfrog/bintray/gradle/gradle-bintray-plugin/1.2/BUILD
index 586959d..a19ab69 100644
--- a/common/m2/repository/com/jfrog/bintray/gradle/gradle-bintray-plugin/1.2/BUILD
+++ b/common/m2/repository/com/jfrog/bintray/gradle/gradle-bintray-plugin/1.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/joanzapata/iconify/android-iconify-fontawesome/2.1.1/BUILD b/common/m2/repository/com/joanzapata/iconify/android-iconify-fontawesome/2.1.1/BUILD
index 0daa209..da350bc 100644
--- a/common/m2/repository/com/joanzapata/iconify/android-iconify-fontawesome/2.1.1/BUILD
+++ b/common/m2/repository/com/joanzapata/iconify/android-iconify-fontawesome/2.1.1/BUILD
@@ -1,5 +1,12 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
+
+maven_aar(
+ name = "aar",
+ aar = "android-iconify-fontawesome-2.1.1.aar",
+ pom = ":pom",
+ visibility = ["//visibility:public"],
+)
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/joanzapata/iconify/android-iconify-material/2.1.1/BUILD b/common/m2/repository/com/joanzapata/iconify/android-iconify-material/2.1.1/BUILD
index 4afe24f..2b55940 100644
--- a/common/m2/repository/com/joanzapata/iconify/android-iconify-material/2.1.1/BUILD
+++ b/common/m2/repository/com/joanzapata/iconify/android-iconify-material/2.1.1/BUILD
@@ -1,5 +1,12 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
+
+maven_aar(
+ name = "aar",
+ aar = "android-iconify-material-2.1.1.aar",
+ pom = ":pom",
+ visibility = ["//visibility:public"],
+)
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/joanzapata/iconify/android-iconify/2.2.1/BUILD b/common/m2/repository/com/joanzapata/iconify/android-iconify/2.2.1/BUILD
index 357a608..618dcaa 100644
--- a/common/m2/repository/com/joanzapata/iconify/android-iconify/2.2.1/BUILD
+++ b/common/m2/repository/com/joanzapata/iconify/android-iconify/2.2.1/BUILD
@@ -1,5 +1,12 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
+
+maven_aar(
+ name = "aar",
+ aar = "android-iconify-2.2.1.aar",
+ pom = ":pom",
+ visibility = ["//visibility:public"],
+)
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/neenbedankt/gradle/plugins/android-apt/1.8/BUILD b/common/m2/repository/com/neenbedankt/gradle/plugins/android-apt/1.8/BUILD
index 7c17de9..49e36a4 100644
--- a/common/m2/repository/com/neenbedankt/gradle/plugins/android-apt/1.8/BUILD
+++ b/common/m2/repository/com/neenbedankt/gradle/plugins/android-apt/1.8/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/nineoldandroids/library/2.4.0/BUILD b/common/m2/repository/com/nineoldandroids/library/2.4.0/BUILD
index 21818c3..3594245 100644
--- a/common/m2/repository/com/nineoldandroids/library/2.4.0/BUILD
+++ b/common/m2/repository/com/nineoldandroids/library/2.4.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/nineoldandroids/parent/2.4.0/BUILD b/common/m2/repository/com/nineoldandroids/parent/2.4.0/BUILD
index 3f3ec88..9a306c8 100644
--- a/common/m2/repository/com/nineoldandroids/parent/2.4.0/BUILD
+++ b/common/m2/repository/com/nineoldandroids/parent/2.4.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/puppycrawl/tools/checkstyle/5.9/BUILD b/common/m2/repository/com/puppycrawl/tools/checkstyle/5.9/BUILD
index 3c3bd9a..d4dff68 100644
--- a/common/m2/repository/com/puppycrawl/tools/checkstyle/5.9/BUILD
+++ b/common/m2/repository/com/puppycrawl/tools/checkstyle/5.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/squareup/dagger/dagger-compiler/1.2.2/BUILD b/common/m2/repository/com/squareup/dagger/dagger-compiler/1.2.2/BUILD
index b62f408..3ef74ef 100644
--- a/common/m2/repository/com/squareup/dagger/dagger-compiler/1.2.2/BUILD
+++ b/common/m2/repository/com/squareup/dagger/dagger-compiler/1.2.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/squareup/dagger/dagger-parent/1.2.2/BUILD b/common/m2/repository/com/squareup/dagger/dagger-parent/1.2.2/BUILD
index 0a16a75..9109b0f 100644
--- a/common/m2/repository/com/squareup/dagger/dagger-parent/1.2.2/BUILD
+++ b/common/m2/repository/com/squareup/dagger/dagger-parent/1.2.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/squareup/dagger/dagger/1.2.2/BUILD b/common/m2/repository/com/squareup/dagger/dagger/1.2.2/BUILD
index d2548e2..3448ec9 100644
--- a/common/m2/repository/com/squareup/dagger/dagger/1.2.2/BUILD
+++ b/common/m2/repository/com/squareup/dagger/dagger/1.2.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/squareup/haha/haha/1.3/BUILD b/common/m2/repository/com/squareup/haha/haha/1.3/BUILD
index 314f18c..a79ca95 100644
--- a/common/m2/repository/com/squareup/haha/haha/1.3/BUILD
+++ b/common/m2/repository/com/squareup/haha/haha/1.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/squareup/haha/haha/2.0.2/BUILD b/common/m2/repository/com/squareup/haha/haha/2.0.2/BUILD
index 1f73b12..15736c9 100644
--- a/common/m2/repository/com/squareup/haha/haha/2.0.2/BUILD
+++ b/common/m2/repository/com/squareup/haha/haha/2.0.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/squareup/javapoet/1.7.0/BUILD b/common/m2/repository/com/squareup/javapoet/1.7.0/BUILD
index 7cc8e65..744e423 100644
--- a/common/m2/repository/com/squareup/javapoet/1.7.0/BUILD
+++ b/common/m2/repository/com/squareup/javapoet/1.7.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/squareup/javawriter/2.1.1/BUILD b/common/m2/repository/com/squareup/javawriter/2.1.1/BUILD
index 9f14ec0..5ca8456 100644
--- a/common/m2/repository/com/squareup/javawriter/2.1.1/BUILD
+++ b/common/m2/repository/com/squareup/javawriter/2.1.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/squareup/javawriter/2.2.1/BUILD b/common/m2/repository/com/squareup/javawriter/2.2.1/BUILD
index 19c8328..2fa326c 100644
--- a/common/m2/repository/com/squareup/javawriter/2.2.1/BUILD
+++ b/common/m2/repository/com/squareup/javawriter/2.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/squareup/javawriter/2.5.0/BUILD b/common/m2/repository/com/squareup/javawriter/2.5.0/BUILD
index 8f636cd..ae0011e 100644
--- a/common/m2/repository/com/squareup/javawriter/2.5.0/BUILD
+++ b/common/m2/repository/com/squareup/javawriter/2.5.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/squareup/javawriter/2.5.1/BUILD b/common/m2/repository/com/squareup/javawriter/2.5.1/BUILD
index a40bf8c..00a8809 100644
--- a/common/m2/repository/com/squareup/javawriter/2.5.1/BUILD
+++ b/common/m2/repository/com/squareup/javawriter/2.5.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/squareup/okhttp/mockwebserver/2.7.4/BUILD b/common/m2/repository/com/squareup/okhttp/mockwebserver/2.7.4/BUILD
index 3ea70c7..cf2df65 100644
--- a/common/m2/repository/com/squareup/okhttp/mockwebserver/2.7.4/BUILD
+++ b/common/m2/repository/com/squareup/okhttp/mockwebserver/2.7.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/squareup/okhttp/okhttp-testing-support/2.7.4/BUILD b/common/m2/repository/com/squareup/okhttp/okhttp-testing-support/2.7.4/BUILD
index acde98d..8db909b 100644
--- a/common/m2/repository/com/squareup/okhttp/okhttp-testing-support/2.7.4/BUILD
+++ b/common/m2/repository/com/squareup/okhttp/okhttp-testing-support/2.7.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/squareup/okhttp/okhttp-urlconnection/2.7.4/BUILD b/common/m2/repository/com/squareup/okhttp/okhttp-urlconnection/2.7.4/BUILD
index 6670c4f..3336980 100644
--- a/common/m2/repository/com/squareup/okhttp/okhttp-urlconnection/2.7.4/BUILD
+++ b/common/m2/repository/com/squareup/okhttp/okhttp-urlconnection/2.7.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/squareup/okhttp/okhttp-ws/2.7.4/BUILD b/common/m2/repository/com/squareup/okhttp/okhttp-ws/2.7.4/BUILD
index 0813b6b..a629819 100644
--- a/common/m2/repository/com/squareup/okhttp/okhttp-ws/2.7.4/BUILD
+++ b/common/m2/repository/com/squareup/okhttp/okhttp-ws/2.7.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/squareup/okhttp/okhttp/2.5.0/BUILD b/common/m2/repository/com/squareup/okhttp/okhttp/2.5.0/BUILD
index 7ae93d2..0c09f99 100644
--- a/common/m2/repository/com/squareup/okhttp/okhttp/2.5.0/BUILD
+++ b/common/m2/repository/com/squareup/okhttp/okhttp/2.5.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/squareup/okhttp/okhttp/2.7.4/BUILD b/common/m2/repository/com/squareup/okhttp/okhttp/2.7.4/BUILD
index 7628713..b98ef88 100644
--- a/common/m2/repository/com/squareup/okhttp/okhttp/2.7.4/BUILD
+++ b/common/m2/repository/com/squareup/okhttp/okhttp/2.7.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/squareup/okhttp/parent/2.5.0/BUILD b/common/m2/repository/com/squareup/okhttp/parent/2.5.0/BUILD
index fe2bd90..8288eee 100644
--- a/common/m2/repository/com/squareup/okhttp/parent/2.5.0/BUILD
+++ b/common/m2/repository/com/squareup/okhttp/parent/2.5.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/squareup/okhttp/parent/2.7.4/BUILD b/common/m2/repository/com/squareup/okhttp/parent/2.7.4/BUILD
index 8e339a7..4365cf3 100644
--- a/common/m2/repository/com/squareup/okhttp/parent/2.7.4/BUILD
+++ b/common/m2/repository/com/squareup/okhttp/parent/2.7.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/squareup/okio/okio-parent/1.2.0/BUILD b/common/m2/repository/com/squareup/okio/okio-parent/1.2.0/BUILD
index 6d2c346..cd9e4ef 100644
--- a/common/m2/repository/com/squareup/okio/okio-parent/1.2.0/BUILD
+++ b/common/m2/repository/com/squareup/okio/okio-parent/1.2.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/squareup/okio/okio-parent/1.6.0/BUILD b/common/m2/repository/com/squareup/okio/okio-parent/1.6.0/BUILD
index f097d24..033806c 100644
--- a/common/m2/repository/com/squareup/okio/okio-parent/1.6.0/BUILD
+++ b/common/m2/repository/com/squareup/okio/okio-parent/1.6.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/squareup/okio/okio/1.2.0/BUILD b/common/m2/repository/com/squareup/okio/okio/1.2.0/BUILD
index 46a0352..0212d4f 100644
--- a/common/m2/repository/com/squareup/okio/okio/1.2.0/BUILD
+++ b/common/m2/repository/com/squareup/okio/okio/1.2.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/squareup/okio/okio/1.6.0/BUILD b/common/m2/repository/com/squareup/okio/okio/1.6.0/BUILD
index c508472..e439994 100644
--- a/common/m2/repository/com/squareup/okio/okio/1.6.0/BUILD
+++ b/common/m2/repository/com/squareup/okio/okio/1.6.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/sun/istack/istack-commons-runtime/2.21/BUILD b/common/m2/repository/com/sun/istack/istack-commons-runtime/2.21/BUILD
index febd237..b4dac30 100644
--- a/common/m2/repository/com/sun/istack/istack-commons-runtime/2.21/BUILD
+++ b/common/m2/repository/com/sun/istack/istack-commons-runtime/2.21/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/sun/istack/istack-commons-tools/2.21/BUILD b/common/m2/repository/com/sun/istack/istack-commons-tools/2.21/BUILD
index 9f83fa7..73f1c09 100644
--- a/common/m2/repository/com/sun/istack/istack-commons-tools/2.21/BUILD
+++ b/common/m2/repository/com/sun/istack/istack-commons-tools/2.21/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/sun/istack/istack-commons/2.21/BUILD b/common/m2/repository/com/sun/istack/istack-commons/2.21/BUILD
index 736c6b8..fbb11b6 100644
--- a/common/m2/repository/com/sun/istack/istack-commons/2.21/BUILD
+++ b/common/m2/repository/com/sun/istack/istack-commons/2.21/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/sun/xml/bind/external/rngom/2.2.11/BUILD b/common/m2/repository/com/sun/xml/bind/external/rngom/2.2.11/BUILD
index d96c695..b544932 100644
--- a/common/m2/repository/com/sun/xml/bind/external/rngom/2.2.11/BUILD
+++ b/common/m2/repository/com/sun/xml/bind/external/rngom/2.2.11/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/sun/xml/bind/jaxb-bom-ext/2.2.11/BUILD b/common/m2/repository/com/sun/xml/bind/jaxb-bom-ext/2.2.11/BUILD
index 501e680..9335978 100644
--- a/common/m2/repository/com/sun/xml/bind/jaxb-bom-ext/2.2.11/BUILD
+++ b/common/m2/repository/com/sun/xml/bind/jaxb-bom-ext/2.2.11/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/sun/xml/bind/mvn/jaxb-codemodel-parent/2.2.11/BUILD b/common/m2/repository/com/sun/xml/bind/mvn/jaxb-codemodel-parent/2.2.11/BUILD
index 6b77892..be62baa 100644
--- a/common/m2/repository/com/sun/xml/bind/mvn/jaxb-codemodel-parent/2.2.11/BUILD
+++ b/common/m2/repository/com/sun/xml/bind/mvn/jaxb-codemodel-parent/2.2.11/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/sun/xml/bind/mvn/jaxb-external-parent/2.2.11/BUILD b/common/m2/repository/com/sun/xml/bind/mvn/jaxb-external-parent/2.2.11/BUILD
index 2b0f31f..215d00b 100644
--- a/common/m2/repository/com/sun/xml/bind/mvn/jaxb-external-parent/2.2.11/BUILD
+++ b/common/m2/repository/com/sun/xml/bind/mvn/jaxb-external-parent/2.2.11/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/sun/xml/bind/mvn/jaxb-parent/2.2.11/BUILD b/common/m2/repository/com/sun/xml/bind/mvn/jaxb-parent/2.2.11/BUILD
index 54070eb..c2dfaea 100644
--- a/common/m2/repository/com/sun/xml/bind/mvn/jaxb-parent/2.2.11/BUILD
+++ b/common/m2/repository/com/sun/xml/bind/mvn/jaxb-parent/2.2.11/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/sun/xml/bind/mvn/jaxb-runtime-parent/2.2.11/BUILD b/common/m2/repository/com/sun/xml/bind/mvn/jaxb-runtime-parent/2.2.11/BUILD
index db61956..e23bb3d 100644
--- a/common/m2/repository/com/sun/xml/bind/mvn/jaxb-runtime-parent/2.2.11/BUILD
+++ b/common/m2/repository/com/sun/xml/bind/mvn/jaxb-runtime-parent/2.2.11/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/sun/xml/bind/mvn/jaxb-txw-parent/2.2.11/BUILD b/common/m2/repository/com/sun/xml/bind/mvn/jaxb-txw-parent/2.2.11/BUILD
index bd8c38f..3c1ac8b 100644
--- a/common/m2/repository/com/sun/xml/bind/mvn/jaxb-txw-parent/2.2.11/BUILD
+++ b/common/m2/repository/com/sun/xml/bind/mvn/jaxb-txw-parent/2.2.11/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/sun/xml/dtd-parser/dtd-parser/1.1/BUILD b/common/m2/repository/com/sun/xml/dtd-parser/dtd-parser/1.1/BUILD
index 39ad224..1fd7b7b 100644
--- a/common/m2/repository/com/sun/xml/dtd-parser/dtd-parser/1.1/BUILD
+++ b/common/m2/repository/com/sun/xml/dtd-parser/dtd-parser/1.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/sun/xml/fastinfoset/FastInfoset/1.2.13/BUILD b/common/m2/repository/com/sun/xml/fastinfoset/FastInfoset/1.2.13/BUILD
index d35ba6e..a957ceb 100644
--- a/common/m2/repository/com/sun/xml/fastinfoset/FastInfoset/1.2.13/BUILD
+++ b/common/m2/repository/com/sun/xml/fastinfoset/FastInfoset/1.2.13/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/sun/xml/fastinfoset/fastinfoset-project/1.2.13/BUILD b/common/m2/repository/com/sun/xml/fastinfoset/fastinfoset-project/1.2.13/BUILD
index 919046f..6a0a837 100644
--- a/common/m2/repository/com/sun/xml/fastinfoset/fastinfoset-project/1.2.13/BUILD
+++ b/common/m2/repository/com/sun/xml/fastinfoset/fastinfoset-project/1.2.13/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/sun/xsom/xsom/20140925/BUILD b/common/m2/repository/com/sun/xsom/xsom/20140925/BUILD
index 6cd1e1b..453bd97 100644
--- a/common/m2/repository/com/sun/xsom/xsom/20140925/BUILD
+++ b/common/m2/repository/com/sun/xsom/xsom/20140925/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/thoughtworks/qdox/qdox/1.12/BUILD b/common/m2/repository/com/thoughtworks/qdox/qdox/1.12/BUILD
index 00308ca..0e52332 100644
--- a/common/m2/repository/com/thoughtworks/qdox/qdox/1.12/BUILD
+++ b/common/m2/repository/com/thoughtworks/qdox/qdox/1.12/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/thoughtworks/xstream/xstream-parent/1.4.8/BUILD b/common/m2/repository/com/thoughtworks/xstream/xstream-parent/1.4.8/BUILD
index cd31161..c489740 100644
--- a/common/m2/repository/com/thoughtworks/xstream/xstream-parent/1.4.8/BUILD
+++ b/common/m2/repository/com/thoughtworks/xstream/xstream-parent/1.4.8/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/thoughtworks/xstream/xstream/1.4.8/BUILD b/common/m2/repository/com/thoughtworks/xstream/xstream/1.4.8/BUILD
index 5e468a5..67ea7c2 100644
--- a/common/m2/repository/com/thoughtworks/xstream/xstream/1.4.8/BUILD
+++ b/common/m2/repository/com/thoughtworks/xstream/xstream/1.4.8/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/tunnelvisionlabs/antlr4-annotations/4.5/BUILD b/common/m2/repository/com/tunnelvisionlabs/antlr4-annotations/4.5/BUILD
index 2f62834..29d7103 100644
--- a/common/m2/repository/com/tunnelvisionlabs/antlr4-annotations/4.5/BUILD
+++ b/common/m2/repository/com/tunnelvisionlabs/antlr4-annotations/4.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/tunnelvisionlabs/antlr4-master/4.5/BUILD b/common/m2/repository/com/tunnelvisionlabs/antlr4-master/4.5/BUILD
index 0734f4f..9f82da0 100644
--- a/common/m2/repository/com/tunnelvisionlabs/antlr4-master/4.5/BUILD
+++ b/common/m2/repository/com/tunnelvisionlabs/antlr4-master/4.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/com/tunnelvisionlabs/antlr4-runtime/4.5/BUILD b/common/m2/repository/com/tunnelvisionlabs/antlr4-runtime/4.5/BUILD
index aca0c0d..d6ca209 100644
--- a/common/m2/repository/com/tunnelvisionlabs/antlr4-runtime/4.5/BUILD
+++ b/common/m2/repository/com/tunnelvisionlabs/antlr4-runtime/4.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/tunnelvisionlabs/antlr4/4.5/BUILD b/common/m2/repository/com/tunnelvisionlabs/antlr4/4.5/BUILD
index a507ca1..cc1bfd8 100644
--- a/common/m2/repository/com/tunnelvisionlabs/antlr4/4.5/BUILD
+++ b/common/m2/repository/com/tunnelvisionlabs/antlr4/4.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/ximpleware/vtd-xml/2.11/BUILD b/common/m2/repository/com/ximpleware/vtd-xml/2.11/BUILD
index 10dce7f..8d1a01a 100644
--- a/common/m2/repository/com/ximpleware/vtd-xml/2.11/BUILD
+++ b/common/m2/repository/com/ximpleware/vtd-xml/2.11/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/com/yqritc/recyclerview-flexibledivider/1.2.6/BUILD b/common/m2/repository/com/yqritc/recyclerview-flexibledivider/1.2.6/BUILD
index cf2c35e..d26222c 100644
--- a/common/m2/repository/com/yqritc/recyclerview-flexibledivider/1.2.6/BUILD
+++ b/common/m2/repository/com/yqritc/recyclerview-flexibledivider/1.2.6/BUILD
@@ -1,5 +1,12 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
+
+maven_aar(
+ name = "aar",
+ aar = "recyclerview-flexibledivider-1.2.6.aar",
+ pom = ":pom",
+ visibility = ["//visibility:public"],
+)
maven_pom(
name = "pom",
diff --git a/common/m2/repository/commons-beanutils/commons-beanutils-core/1.8.3/BUILD b/common/m2/repository/commons-beanutils/commons-beanutils-core/1.8.3/BUILD
index dc91e54..8396fea 100644
--- a/common/m2/repository/commons-beanutils/commons-beanutils-core/1.8.3/BUILD
+++ b/common/m2/repository/commons-beanutils/commons-beanutils-core/1.8.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/commons-beanutils/commons-beanutils/1.6/BUILD b/common/m2/repository/commons-beanutils/commons-beanutils/1.6/BUILD
index e385811..6e0b386 100644
--- a/common/m2/repository/commons-beanutils/commons-beanutils/1.6/BUILD
+++ b/common/m2/repository/commons-beanutils/commons-beanutils/1.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/commons-beanutils/commons-beanutils/1.7.0/BUILD b/common/m2/repository/commons-beanutils/commons-beanutils/1.7.0/BUILD
index f0dd2da..16d211d 100644
--- a/common/m2/repository/commons-beanutils/commons-beanutils/1.7.0/BUILD
+++ b/common/m2/repository/commons-beanutils/commons-beanutils/1.7.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/commons-beanutils/commons-beanutils/1.8.0/BUILD b/common/m2/repository/commons-beanutils/commons-beanutils/1.8.0/BUILD
index 1e4ff5b..efccab2 100644
--- a/common/m2/repository/commons-beanutils/commons-beanutils/1.8.0/BUILD
+++ b/common/m2/repository/commons-beanutils/commons-beanutils/1.8.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/commons-beanutils/commons-beanutils/1.9.2/BUILD b/common/m2/repository/commons-beanutils/commons-beanutils/1.9.2/BUILD
index 8290f66..7fccadd 100644
--- a/common/m2/repository/commons-beanutils/commons-beanutils/1.9.2/BUILD
+++ b/common/m2/repository/commons-beanutils/commons-beanutils/1.9.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/commons-cli/commons-cli/1.0/BUILD b/common/m2/repository/commons-cli/commons-cli/1.0/BUILD
index d4a04ce..25ef1ef 100644
--- a/common/m2/repository/commons-cli/commons-cli/1.0/BUILD
+++ b/common/m2/repository/commons-cli/commons-cli/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/commons-cli/commons-cli/1.2/BUILD b/common/m2/repository/commons-cli/commons-cli/1.2/BUILD
index 7c3f68a..e6de0da 100644
--- a/common/m2/repository/commons-cli/commons-cli/1.2/BUILD
+++ b/common/m2/repository/commons-cli/commons-cli/1.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/commons-cli/commons-cli/1.3.1/BUILD b/common/m2/repository/commons-cli/commons-cli/1.3.1/BUILD
index edcb285..97c886a 100644
--- a/common/m2/repository/commons-cli/commons-cli/1.3.1/BUILD
+++ b/common/m2/repository/commons-cli/commons-cli/1.3.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/commons-codec/commons-codec/1.10/BUILD b/common/m2/repository/commons-codec/commons-codec/1.10/BUILD
index 280634d..5aa3c90 100644
--- a/common/m2/repository/commons-codec/commons-codec/1.10/BUILD
+++ b/common/m2/repository/commons-codec/commons-codec/1.10/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/commons-codec/commons-codec/1.3/BUILD b/common/m2/repository/commons-codec/commons-codec/1.3/BUILD
index 13ad997..87fee83 100644
--- a/common/m2/repository/commons-codec/commons-codec/1.3/BUILD
+++ b/common/m2/repository/commons-codec/commons-codec/1.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/commons-codec/commons-codec/1.4/BUILD b/common/m2/repository/commons-codec/commons-codec/1.4/BUILD
index a0fe5b1..aecd0fa 100644
--- a/common/m2/repository/commons-codec/commons-codec/1.4/BUILD
+++ b/common/m2/repository/commons-codec/commons-codec/1.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/commons-codec/commons-codec/1.6/BUILD b/common/m2/repository/commons-codec/commons-codec/1.6/BUILD
index 0785251..53687ff 100644
--- a/common/m2/repository/commons-codec/commons-codec/1.6/BUILD
+++ b/common/m2/repository/commons-codec/commons-codec/1.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/commons-codec/commons-codec/1.9/BUILD b/common/m2/repository/commons-codec/commons-codec/1.9/BUILD
index 7c22a6e..386d220 100644
--- a/common/m2/repository/commons-codec/commons-codec/1.9/BUILD
+++ b/common/m2/repository/commons-codec/commons-codec/1.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/commons-collections/commons-collections/2.0/BUILD b/common/m2/repository/commons-collections/commons-collections/2.0/BUILD
index 243b447..67af37b 100644
--- a/common/m2/repository/commons-collections/commons-collections/2.0/BUILD
+++ b/common/m2/repository/commons-collections/commons-collections/2.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/commons-collections/commons-collections/2.1/BUILD b/common/m2/repository/commons-collections/commons-collections/2.1/BUILD
index be3be5d..20f86fc 100644
--- a/common/m2/repository/commons-collections/commons-collections/2.1/BUILD
+++ b/common/m2/repository/commons-collections/commons-collections/2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/commons-collections/commons-collections/3.1/BUILD b/common/m2/repository/commons-collections/commons-collections/3.1/BUILD
index 5e61e86..6a4f079 100644
--- a/common/m2/repository/commons-collections/commons-collections/3.1/BUILD
+++ b/common/m2/repository/commons-collections/commons-collections/3.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/commons-collections/commons-collections/3.2.1/BUILD b/common/m2/repository/commons-collections/commons-collections/3.2.1/BUILD
index f336471..7d50447 100644
--- a/common/m2/repository/commons-collections/commons-collections/3.2.1/BUILD
+++ b/common/m2/repository/commons-collections/commons-collections/3.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/commons-collections/commons-collections/3.2.2/BUILD b/common/m2/repository/commons-collections/commons-collections/3.2.2/BUILD
index c6a7b52..988c501 100644
--- a/common/m2/repository/commons-collections/commons-collections/3.2.2/BUILD
+++ b/common/m2/repository/commons-collections/commons-collections/3.2.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/commons-collections/commons-collections/3.2/BUILD b/common/m2/repository/commons-collections/commons-collections/3.2/BUILD
index 032a78b..2fc0b85 100644
--- a/common/m2/repository/commons-collections/commons-collections/3.2/BUILD
+++ b/common/m2/repository/commons-collections/commons-collections/3.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/commons-digester/commons-digester/1.6/BUILD b/common/m2/repository/commons-digester/commons-digester/1.6/BUILD
index 6dbef64..beac9eb 100644
--- a/common/m2/repository/commons-digester/commons-digester/1.6/BUILD
+++ b/common/m2/repository/commons-digester/commons-digester/1.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/commons-io/commons-io/1.3.2/BUILD b/common/m2/repository/commons-io/commons-io/1.3.2/BUILD
index 07c0767..523747a 100644
--- a/common/m2/repository/commons-io/commons-io/1.3.2/BUILD
+++ b/common/m2/repository/commons-io/commons-io/1.3.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/commons-io/commons-io/1.4/BUILD b/common/m2/repository/commons-io/commons-io/1.4/BUILD
index f67b030..9ace2cc 100644
--- a/common/m2/repository/commons-io/commons-io/1.4/BUILD
+++ b/common/m2/repository/commons-io/commons-io/1.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/commons-io/commons-io/2.4/BUILD b/common/m2/repository/commons-io/commons-io/2.4/BUILD
index 872e640..cb2241f 100644
--- a/common/m2/repository/commons-io/commons-io/2.4/BUILD
+++ b/common/m2/repository/commons-io/commons-io/2.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/commons-lang/commons-lang/2.1/BUILD b/common/m2/repository/commons-lang/commons-lang/2.1/BUILD
index 3439186..b902578 100644
--- a/common/m2/repository/commons-lang/commons-lang/2.1/BUILD
+++ b/common/m2/repository/commons-lang/commons-lang/2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/commons-lang/commons-lang/2.4/BUILD b/common/m2/repository/commons-lang/commons-lang/2.4/BUILD
index 47adaed..3e625f9 100644
--- a/common/m2/repository/commons-lang/commons-lang/2.4/BUILD
+++ b/common/m2/repository/commons-lang/commons-lang/2.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/commons-lang/commons-lang/2.6/BUILD b/common/m2/repository/commons-lang/commons-lang/2.6/BUILD
index 8726658..5ecd081 100644
--- a/common/m2/repository/commons-lang/commons-lang/2.6/BUILD
+++ b/common/m2/repository/commons-lang/commons-lang/2.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/commons-logging/commons-logging-api/1.1/BUILD b/common/m2/repository/commons-logging/commons-logging-api/1.1/BUILD
index c20abd6..9511201 100644
--- a/common/m2/repository/commons-logging/commons-logging-api/1.1/BUILD
+++ b/common/m2/repository/commons-logging/commons-logging-api/1.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/commons-logging/commons-logging/1.0.3/BUILD b/common/m2/repository/commons-logging/commons-logging/1.0.3/BUILD
index af9b7e3..8db0148 100644
--- a/common/m2/repository/commons-logging/commons-logging/1.0.3/BUILD
+++ b/common/m2/repository/commons-logging/commons-logging/1.0.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/commons-logging/commons-logging/1.0.4/BUILD b/common/m2/repository/commons-logging/commons-logging/1.0.4/BUILD
index 9ea6762..640529f 100644
--- a/common/m2/repository/commons-logging/commons-logging/1.0.4/BUILD
+++ b/common/m2/repository/commons-logging/commons-logging/1.0.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/commons-logging/commons-logging/1.0/BUILD b/common/m2/repository/commons-logging/commons-logging/1.0/BUILD
index 467e019..f7b6210 100644
--- a/common/m2/repository/commons-logging/commons-logging/1.0/BUILD
+++ b/common/m2/repository/commons-logging/commons-logging/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/commons-logging/commons-logging/1.1.1/BUILD b/common/m2/repository/commons-logging/commons-logging/1.1.1/BUILD
index 562db01..2917317 100644
--- a/common/m2/repository/commons-logging/commons-logging/1.1.1/BUILD
+++ b/common/m2/repository/commons-logging/commons-logging/1.1.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/commons-logging/commons-logging/1.1.3/BUILD b/common/m2/repository/commons-logging/commons-logging/1.1.3/BUILD
index 7fd0c2a..c938222 100644
--- a/common/m2/repository/commons-logging/commons-logging/1.1.3/BUILD
+++ b/common/m2/repository/commons-logging/commons-logging/1.1.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/commons-validator/commons-validator/1.2.0/BUILD b/common/m2/repository/commons-validator/commons-validator/1.2.0/BUILD
index a8e8b16..802b440 100644
--- a/common/m2/repository/commons-validator/commons-validator/1.2.0/BUILD
+++ b/common/m2/repository/commons-validator/commons-validator/1.2.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/de/greenrobot/eventbus/2.4.0/BUILD b/common/m2/repository/de/greenrobot/eventbus/2.4.0/BUILD
index a651616..38f4f34 100644
--- a/common/m2/repository/de/greenrobot/eventbus/2.4.0/BUILD
+++ b/common/m2/repository/de/greenrobot/eventbus/2.4.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/de/pdark/decentxml/1.3/BUILD b/common/m2/repository/de/pdark/decentxml/1.3/BUILD
index d4c251c..345de42 100644
--- a/common/m2/repository/de/pdark/decentxml/1.3/BUILD
+++ b/common/m2/repository/de/pdark/decentxml/1.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/docbook/docbook-xsl/1.75.2/BUILD b/common/m2/repository/docbook/docbook-xsl/1.75.2/BUILD
index c4b5cec..6e393b3 100644
--- a/common/m2/repository/docbook/docbook-xsl/1.75.2/BUILD
+++ b/common/m2/repository/docbook/docbook-xsl/1.75.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/dom4j/dom4j/1.6.1/BUILD b/common/m2/repository/dom4j/dom4j/1.6.1/BUILD
index bfa2d58..6048c46 100644
--- a/common/m2/repository/dom4j/dom4j/1.6.1/BUILD
+++ b/common/m2/repository/dom4j/dom4j/1.6.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/grpc/grpc-all/0.13.2/BUILD b/common/m2/repository/io/grpc/grpc-all/0.13.2/BUILD
index cb8f0d2..ca89e78 100644
--- a/common/m2/repository/io/grpc/grpc-all/0.13.2/BUILD
+++ b/common/m2/repository/io/grpc/grpc-all/0.13.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/grpc/grpc-all/1.0.1/BUILD b/common/m2/repository/io/grpc/grpc-all/1.0.1/BUILD
index 4905e2a..d85b89d 100644
--- a/common/m2/repository/io/grpc/grpc-all/1.0.1/BUILD
+++ b/common/m2/repository/io/grpc/grpc-all/1.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/grpc/grpc-auth/0.13.2/BUILD b/common/m2/repository/io/grpc/grpc-auth/0.13.2/BUILD
index 00d4a4d..4b268ee 100644
--- a/common/m2/repository/io/grpc/grpc-auth/0.13.2/BUILD
+++ b/common/m2/repository/io/grpc/grpc-auth/0.13.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/grpc/grpc-auth/1.0.1/BUILD b/common/m2/repository/io/grpc/grpc-auth/1.0.1/BUILD
index f9f2029..14c90bf 100644
--- a/common/m2/repository/io/grpc/grpc-auth/1.0.1/BUILD
+++ b/common/m2/repository/io/grpc/grpc-auth/1.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/grpc/grpc-context/1.0.1/BUILD b/common/m2/repository/io/grpc/grpc-context/1.0.1/BUILD
index e1da282..d65b515 100644
--- a/common/m2/repository/io/grpc/grpc-context/1.0.1/BUILD
+++ b/common/m2/repository/io/grpc/grpc-context/1.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/grpc/grpc-core/0.13.2/BUILD b/common/m2/repository/io/grpc/grpc-core/0.13.2/BUILD
index 77899b9..68a7d85 100644
--- a/common/m2/repository/io/grpc/grpc-core/0.13.2/BUILD
+++ b/common/m2/repository/io/grpc/grpc-core/0.13.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/grpc/grpc-core/1.0.1/BUILD b/common/m2/repository/io/grpc/grpc-core/1.0.1/BUILD
index aa46d7a..cfdc12d 100644
--- a/common/m2/repository/io/grpc/grpc-core/1.0.1/BUILD
+++ b/common/m2/repository/io/grpc/grpc-core/1.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/grpc/grpc-netty/0.13.2/BUILD b/common/m2/repository/io/grpc/grpc-netty/0.13.2/BUILD
index 5ae1482..a049374 100644
--- a/common/m2/repository/io/grpc/grpc-netty/0.13.2/BUILD
+++ b/common/m2/repository/io/grpc/grpc-netty/0.13.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/grpc/grpc-netty/1.0.1/BUILD b/common/m2/repository/io/grpc/grpc-netty/1.0.1/BUILD
index 386d70d..6a4164b 100644
--- a/common/m2/repository/io/grpc/grpc-netty/1.0.1/BUILD
+++ b/common/m2/repository/io/grpc/grpc-netty/1.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/grpc/grpc-okhttp/0.13.2/BUILD b/common/m2/repository/io/grpc/grpc-okhttp/0.13.2/BUILD
index 901c602..a44d894 100644
--- a/common/m2/repository/io/grpc/grpc-okhttp/0.13.2/BUILD
+++ b/common/m2/repository/io/grpc/grpc-okhttp/0.13.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/grpc/grpc-okhttp/1.0.1/BUILD b/common/m2/repository/io/grpc/grpc-okhttp/1.0.1/BUILD
index 5e57c38..35b5b0b 100644
--- a/common/m2/repository/io/grpc/grpc-okhttp/1.0.1/BUILD
+++ b/common/m2/repository/io/grpc/grpc-okhttp/1.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/grpc/grpc-protobuf-lite/1.0.1/BUILD b/common/m2/repository/io/grpc/grpc-protobuf-lite/1.0.1/BUILD
index bf781e6..f79d571 100644
--- a/common/m2/repository/io/grpc/grpc-protobuf-lite/1.0.1/BUILD
+++ b/common/m2/repository/io/grpc/grpc-protobuf-lite/1.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/grpc/grpc-protobuf-nano/0.13.2/BUILD b/common/m2/repository/io/grpc/grpc-protobuf-nano/0.13.2/BUILD
index cfe98a8..978da34 100644
--- a/common/m2/repository/io/grpc/grpc-protobuf-nano/0.13.2/BUILD
+++ b/common/m2/repository/io/grpc/grpc-protobuf-nano/0.13.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/grpc/grpc-protobuf-nano/1.0.1/BUILD b/common/m2/repository/io/grpc/grpc-protobuf-nano/1.0.1/BUILD
index 68134cf..fffe0b2 100644
--- a/common/m2/repository/io/grpc/grpc-protobuf-nano/1.0.1/BUILD
+++ b/common/m2/repository/io/grpc/grpc-protobuf-nano/1.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/grpc/grpc-protobuf/0.13.2/BUILD b/common/m2/repository/io/grpc/grpc-protobuf/0.13.2/BUILD
index 88692c5..15cd073 100644
--- a/common/m2/repository/io/grpc/grpc-protobuf/0.13.2/BUILD
+++ b/common/m2/repository/io/grpc/grpc-protobuf/0.13.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/grpc/grpc-protobuf/1.0.1/BUILD b/common/m2/repository/io/grpc/grpc-protobuf/1.0.1/BUILD
index 6757144..b62780b 100644
--- a/common/m2/repository/io/grpc/grpc-protobuf/1.0.1/BUILD
+++ b/common/m2/repository/io/grpc/grpc-protobuf/1.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/grpc/grpc-stub/0.13.2/BUILD b/common/m2/repository/io/grpc/grpc-stub/0.13.2/BUILD
index 78e6482..0ac44cb 100644
--- a/common/m2/repository/io/grpc/grpc-stub/0.13.2/BUILD
+++ b/common/m2/repository/io/grpc/grpc-stub/0.13.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/grpc/grpc-stub/1.0.1/BUILD b/common/m2/repository/io/grpc/grpc-stub/1.0.1/BUILD
index b09e9fb..1f78144 100644
--- a/common/m2/repository/io/grpc/grpc-stub/1.0.1/BUILD
+++ b/common/m2/repository/io/grpc/grpc-stub/1.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/grpc/protoc-gen-grpc-java/0.13.2/BUILD b/common/m2/repository/io/grpc/protoc-gen-grpc-java/0.13.2/BUILD
index f15c660..b40e19f 100644
--- a/common/m2/repository/io/grpc/protoc-gen-grpc-java/0.13.2/BUILD
+++ b/common/m2/repository/io/grpc/protoc-gen-grpc-java/0.13.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/io/grpc/protoc-gen-grpc-java/1.0.1/BUILD b/common/m2/repository/io/grpc/protoc-gen-grpc-java/1.0.1/BUILD
index 3780d67..176fc75 100644
--- a/common/m2/repository/io/grpc/protoc-gen-grpc-java/1.0.1/BUILD
+++ b/common/m2/repository/io/grpc/protoc-gen-grpc-java/1.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/io/netty/netty-buffer/4.1.0.CR3/BUILD b/common/m2/repository/io/netty/netty-buffer/4.1.0.CR3/BUILD
index dd13d9f..f83ea70 100644
--- a/common/m2/repository/io/netty/netty-buffer/4.1.0.CR3/BUILD
+++ b/common/m2/repository/io/netty/netty-buffer/4.1.0.CR3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/netty/netty-buffer/4.1.3.Final/BUILD b/common/m2/repository/io/netty/netty-buffer/4.1.3.Final/BUILD
index 312c7b4..cc268e3 100644
--- a/common/m2/repository/io/netty/netty-buffer/4.1.3.Final/BUILD
+++ b/common/m2/repository/io/netty/netty-buffer/4.1.3.Final/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/netty/netty-codec-http/4.1.0.CR3/BUILD b/common/m2/repository/io/netty/netty-codec-http/4.1.0.CR3/BUILD
index e7cc2fc..d31d803 100644
--- a/common/m2/repository/io/netty/netty-codec-http/4.1.0.CR3/BUILD
+++ b/common/m2/repository/io/netty/netty-codec-http/4.1.0.CR3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/netty/netty-codec-http/4.1.3.Final/BUILD b/common/m2/repository/io/netty/netty-codec-http/4.1.3.Final/BUILD
index a1b62bc..9beff92 100644
--- a/common/m2/repository/io/netty/netty-codec-http/4.1.3.Final/BUILD
+++ b/common/m2/repository/io/netty/netty-codec-http/4.1.3.Final/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/netty/netty-codec-http2/4.1.0.CR3/BUILD b/common/m2/repository/io/netty/netty-codec-http2/4.1.0.CR3/BUILD
index b229dd5..448793d 100644
--- a/common/m2/repository/io/netty/netty-codec-http2/4.1.0.CR3/BUILD
+++ b/common/m2/repository/io/netty/netty-codec-http2/4.1.0.CR3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/netty/netty-codec-http2/4.1.3.Final/BUILD b/common/m2/repository/io/netty/netty-codec-http2/4.1.3.Final/BUILD
index 7c19d3f..36edf47 100644
--- a/common/m2/repository/io/netty/netty-codec-http2/4.1.3.Final/BUILD
+++ b/common/m2/repository/io/netty/netty-codec-http2/4.1.3.Final/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/netty/netty-codec/4.1.0.CR3/BUILD b/common/m2/repository/io/netty/netty-codec/4.1.0.CR3/BUILD
index 80d4e43..7e31421 100644
--- a/common/m2/repository/io/netty/netty-codec/4.1.0.CR3/BUILD
+++ b/common/m2/repository/io/netty/netty-codec/4.1.0.CR3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/netty/netty-codec/4.1.3.Final/BUILD b/common/m2/repository/io/netty/netty-codec/4.1.3.Final/BUILD
index 2f331d4..dc321b5 100644
--- a/common/m2/repository/io/netty/netty-codec/4.1.3.Final/BUILD
+++ b/common/m2/repository/io/netty/netty-codec/4.1.3.Final/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/netty/netty-common/4.1.0.CR3/BUILD b/common/m2/repository/io/netty/netty-common/4.1.0.CR3/BUILD
index 613da40..3131b68 100644
--- a/common/m2/repository/io/netty/netty-common/4.1.0.CR3/BUILD
+++ b/common/m2/repository/io/netty/netty-common/4.1.0.CR3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/netty/netty-common/4.1.3.Final/BUILD b/common/m2/repository/io/netty/netty-common/4.1.3.Final/BUILD
index f373947..95061ac 100644
--- a/common/m2/repository/io/netty/netty-common/4.1.3.Final/BUILD
+++ b/common/m2/repository/io/netty/netty-common/4.1.3.Final/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/netty/netty-handler/4.1.0.CR3/BUILD b/common/m2/repository/io/netty/netty-handler/4.1.0.CR3/BUILD
index f39063b..25e787a 100644
--- a/common/m2/repository/io/netty/netty-handler/4.1.0.CR3/BUILD
+++ b/common/m2/repository/io/netty/netty-handler/4.1.0.CR3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/netty/netty-handler/4.1.3.Final/BUILD b/common/m2/repository/io/netty/netty-handler/4.1.3.Final/BUILD
index bdfc385..464562c 100644
--- a/common/m2/repository/io/netty/netty-handler/4.1.3.Final/BUILD
+++ b/common/m2/repository/io/netty/netty-handler/4.1.3.Final/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/netty/netty-parent/4.1.0.CR3/BUILD b/common/m2/repository/io/netty/netty-parent/4.1.0.CR3/BUILD
index 14c9b33..f1f67b8 100644
--- a/common/m2/repository/io/netty/netty-parent/4.1.0.CR3/BUILD
+++ b/common/m2/repository/io/netty/netty-parent/4.1.0.CR3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/io/netty/netty-parent/4.1.3.Final/BUILD b/common/m2/repository/io/netty/netty-parent/4.1.3.Final/BUILD
index 319cfa5..0545383 100644
--- a/common/m2/repository/io/netty/netty-parent/4.1.3.Final/BUILD
+++ b/common/m2/repository/io/netty/netty-parent/4.1.3.Final/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/io/netty/netty-resolver/4.1.0.CR3/BUILD b/common/m2/repository/io/netty/netty-resolver/4.1.0.CR3/BUILD
index d8a8e97..cdbeca0 100644
--- a/common/m2/repository/io/netty/netty-resolver/4.1.0.CR3/BUILD
+++ b/common/m2/repository/io/netty/netty-resolver/4.1.0.CR3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/netty/netty-resolver/4.1.3.Final/BUILD b/common/m2/repository/io/netty/netty-resolver/4.1.3.Final/BUILD
index 53077f6..2f450c2 100644
--- a/common/m2/repository/io/netty/netty-resolver/4.1.3.Final/BUILD
+++ b/common/m2/repository/io/netty/netty-resolver/4.1.3.Final/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/netty/netty-transport/4.1.0.CR3/BUILD b/common/m2/repository/io/netty/netty-transport/4.1.0.CR3/BUILD
index c208c57..16af3f0 100644
--- a/common/m2/repository/io/netty/netty-transport/4.1.0.CR3/BUILD
+++ b/common/m2/repository/io/netty/netty-transport/4.1.0.CR3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/netty/netty-transport/4.1.3.Final/BUILD b/common/m2/repository/io/netty/netty-transport/4.1.3.Final/BUILD
index 276710a..e245c28 100644
--- a/common/m2/repository/io/netty/netty-transport/4.1.3.Final/BUILD
+++ b/common/m2/repository/io/netty/netty-transport/4.1.3.Final/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/io/reactivex/rxandroid/1.1.0/BUILD b/common/m2/repository/io/reactivex/rxandroid/1.1.0/BUILD
index ca68b40..021074b 100644
--- a/common/m2/repository/io/reactivex/rxandroid/1.1.0/BUILD
+++ b/common/m2/repository/io/reactivex/rxandroid/1.1.0/BUILD
@@ -1,5 +1,12 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
+
+maven_aar(
+ name = "aar",
+ aar = "rxandroid-1.1.0.aar",
+ pom = ":pom",
+ visibility = ["//visibility:public"],
+)
maven_pom(
name = "pom",
diff --git a/common/m2/repository/io/reactivex/rxjava/1.1.0/BUILD b/common/m2/repository/io/reactivex/rxjava/1.1.0/BUILD
index 99b0358..cabec18 100644
--- a/common/m2/repository/io/reactivex/rxjava/1.1.0/BUILD
+++ b/common/m2/repository/io/reactivex/rxjava/1.1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/itext/itext/2.0.8/BUILD b/common/m2/repository/itext/itext/2.0.8/BUILD
index c769899..b0e24c6 100644
--- a/common/m2/repository/itext/itext/2.0.8/BUILD
+++ b/common/m2/repository/itext/itext/2.0.8/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/javax/annotation/javax.annotation-api/1.2/BUILD b/common/m2/repository/javax/annotation/javax.annotation-api/1.2/BUILD
index 5c7dafa..e147d21 100644
--- a/common/m2/repository/javax/annotation/javax.annotation-api/1.2/BUILD
+++ b/common/m2/repository/javax/annotation/javax.annotation-api/1.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/javax/annotation/jsr250-api/1.0/BUILD b/common/m2/repository/javax/annotation/jsr250-api/1.0/BUILD
index d5980e0..76e63b3 100644
--- a/common/m2/repository/javax/annotation/jsr250-api/1.0/BUILD
+++ b/common/m2/repository/javax/annotation/jsr250-api/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/javax/enterprise/cdi-api/1.0/BUILD b/common/m2/repository/javax/enterprise/cdi-api/1.0/BUILD
index 59d1578..af55af9 100644
--- a/common/m2/repository/javax/enterprise/cdi-api/1.0/BUILD
+++ b/common/m2/repository/javax/enterprise/cdi-api/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/javax/inject/javax.inject/1/BUILD b/common/m2/repository/javax/inject/javax.inject/1/BUILD
index 6b81bc8..2484f8e 100644
--- a/common/m2/repository/javax/inject/javax.inject/1/BUILD
+++ b/common/m2/repository/javax/inject/javax.inject/1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/javax/servlet/servlet-api/2.3/BUILD b/common/m2/repository/javax/servlet/servlet-api/2.3/BUILD
index 81cb1a0..facb983 100644
--- a/common/m2/repository/javax/servlet/servlet-api/2.3/BUILD
+++ b/common/m2/repository/javax/servlet/servlet-api/2.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/javax/xml/bind/jaxb-api/2.2.12-b140109.1041/BUILD b/common/m2/repository/javax/xml/bind/jaxb-api/2.2.12-b140109.1041/BUILD
index e96e037..e92bc0d 100644
--- a/common/m2/repository/javax/xml/bind/jaxb-api/2.2.12-b140109.1041/BUILD
+++ b/common/m2/repository/javax/xml/bind/jaxb-api/2.2.12-b140109.1041/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/jaxen/jaxen/1.1.1/BUILD b/common/m2/repository/jaxen/jaxen/1.1.1/BUILD
index f2a2635..27c6e1d 100644
--- a/common/m2/repository/jaxen/jaxen/1.1.1/BUILD
+++ b/common/m2/repository/jaxen/jaxen/1.1.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/jaxen/jaxen/1.1.6/BUILD b/common/m2/repository/jaxen/jaxen/1.1.6/BUILD
index b1e74c5..02fa665 100644
--- a/common/m2/repository/jaxen/jaxen/1.1.6/BUILD
+++ b/common/m2/repository/jaxen/jaxen/1.1.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/jdom/jdom/1.0/BUILD b/common/m2/repository/jdom/jdom/1.0/BUILD
index 6f7255d..d0e59ab 100644
--- a/common/m2/repository/jdom/jdom/1.0/BUILD
+++ b/common/m2/repository/jdom/jdom/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/jfree/jcommon/1.0.12/BUILD b/common/m2/repository/jfree/jcommon/1.0.12/BUILD
index a0d83f6..58425fe 100644
--- a/common/m2/repository/jfree/jcommon/1.0.12/BUILD
+++ b/common/m2/repository/jfree/jcommon/1.0.12/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/jfree/jfreechart/1.0.9/BUILD b/common/m2/repository/jfree/jfreechart/1.0.9/BUILD
index b28de88..3def608 100644
--- a/common/m2/repository/jfree/jfreechart/1.0.9/BUILD
+++ b/common/m2/repository/jfree/jfreechart/1.0.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/jline/jline/0.9.94/BUILD b/common/m2/repository/jline/jline/0.9.94/BUILD
index a94953d..6bb0ceb 100644
--- a/common/m2/repository/jline/jline/0.9.94/BUILD
+++ b/common/m2/repository/jline/jline/0.9.94/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/joda-time/joda-time/2.9.1/BUILD b/common/m2/repository/joda-time/joda-time/2.9.1/BUILD
index 3c7fd39..a53bd18 100644
--- a/common/m2/repository/joda-time/joda-time/2.9.1/BUILD
+++ b/common/m2/repository/joda-time/joda-time/2.9.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/junit/junit-dep/4.10/BUILD b/common/m2/repository/junit/junit-dep/4.10/BUILD
index aaf2cd0..8fbf1e8 100644
--- a/common/m2/repository/junit/junit-dep/4.10/BUILD
+++ b/common/m2/repository/junit/junit-dep/4.10/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/junit/junit/3.8.1/BUILD b/common/m2/repository/junit/junit/3.8.1/BUILD
index c1ac44f..ed150a7 100644
--- a/common/m2/repository/junit/junit/3.8.1/BUILD
+++ b/common/m2/repository/junit/junit/3.8.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/junit/junit/3.8.2/BUILD b/common/m2/repository/junit/junit/3.8.2/BUILD
index 3ccbad3..257c7ff 100644
--- a/common/m2/repository/junit/junit/3.8.2/BUILD
+++ b/common/m2/repository/junit/junit/3.8.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/junit/junit/4.10/BUILD b/common/m2/repository/junit/junit/4.10/BUILD
index c8d73f1..2ff9795 100644
--- a/common/m2/repository/junit/junit/4.10/BUILD
+++ b/common/m2/repository/junit/junit/4.10/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/junit/junit/4.11/BUILD b/common/m2/repository/junit/junit/4.11/BUILD
index 98f9deb..ca4d063 100644
--- a/common/m2/repository/junit/junit/4.11/BUILD
+++ b/common/m2/repository/junit/junit/4.11/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/junit/junit/4.12/BUILD b/common/m2/repository/junit/junit/4.12/BUILD
index 2c52546..7349346 100644
--- a/common/m2/repository/junit/junit/4.12/BUILD
+++ b/common/m2/repository/junit/junit/4.12/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/junit/junit/4.8.2/BUILD b/common/m2/repository/junit/junit/4.8.2/BUILD
index 29c405f..fbeb65c 100644
--- a/common/m2/repository/junit/junit/4.8.2/BUILD
+++ b/common/m2/repository/junit/junit/4.8.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/kr/motd/maven/os-maven-plugin/1.2.3.Final/BUILD b/common/m2/repository/kr/motd/maven/os-maven-plugin/1.2.3.Final/BUILD
index 794f8e2..000e287 100644
--- a/common/m2/repository/kr/motd/maven/os-maven-plugin/1.2.3.Final/BUILD
+++ b/common/m2/repository/kr/motd/maven/os-maven-plugin/1.2.3.Final/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/kr/motd/maven/os-maven-plugin/1.4.0.Final/BUILD b/common/m2/repository/kr/motd/maven/os-maven-plugin/1.4.0.Final/BUILD
index c61f4dc..1d5f191 100644
--- a/common/m2/repository/kr/motd/maven/os-maven-plugin/1.4.0.Final/BUILD
+++ b/common/m2/repository/kr/motd/maven/os-maven-plugin/1.4.0.Final/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/kxml2/kxml2/2.3.0/BUILD b/common/m2/repository/kxml2/kxml2/2.3.0/BUILD
index 8650e94..2bd56d7 100644
--- a/common/m2/repository/kxml2/kxml2/2.3.0/BUILD
+++ b/common/m2/repository/kxml2/kxml2/2.3.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/log4j/log4j/1.2.12/BUILD b/common/m2/repository/log4j/log4j/1.2.12/BUILD
index 841c221..26f2ed8 100644
--- a/common/m2/repository/log4j/log4j/1.2.12/BUILD
+++ b/common/m2/repository/log4j/log4j/1.2.12/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/logkit/logkit/1.0.1/BUILD b/common/m2/repository/logkit/logkit/1.0.1/BUILD
index 420c4fd..5267798 100644
--- a/common/m2/repository/logkit/logkit/1.0.1/BUILD
+++ b/common/m2/repository/logkit/logkit/1.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/nekohtml/nekohtml/1.9.6.2/BUILD b/common/m2/repository/nekohtml/nekohtml/1.9.6.2/BUILD
index a40e43a..00476b9 100644
--- a/common/m2/repository/nekohtml/nekohtml/1.9.6.2/BUILD
+++ b/common/m2/repository/nekohtml/nekohtml/1.9.6.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/nekohtml/xercesMinimal/1.9.6.2/BUILD b/common/m2/repository/nekohtml/xercesMinimal/1.9.6.2/BUILD
index 027a699..36ece6e 100644
--- a/common/m2/repository/nekohtml/xercesMinimal/1.9.6.2/BUILD
+++ b/common/m2/repository/nekohtml/xercesMinimal/1.9.6.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/bytebuddy/byte-buddy-agent/1.4.33/BUILD b/common/m2/repository/net/bytebuddy/byte-buddy-agent/1.4.33/BUILD
index 8df14c9..05c4239 100644
--- a/common/m2/repository/net/bytebuddy/byte-buddy-agent/1.4.33/BUILD
+++ b/common/m2/repository/net/bytebuddy/byte-buddy-agent/1.4.33/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/bytebuddy/byte-buddy-parent/1.4.33/BUILD b/common/m2/repository/net/bytebuddy/byte-buddy-parent/1.4.33/BUILD
index dbd0336..1ca69c4 100644
--- a/common/m2/repository/net/bytebuddy/byte-buddy-parent/1.4.33/BUILD
+++ b/common/m2/repository/net/bytebuddy/byte-buddy-parent/1.4.33/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/net/bytebuddy/byte-buddy/1.4.33/BUILD b/common/m2/repository/net/bytebuddy/byte-buddy/1.4.33/BUILD
index b66f38e..7b8c6cd 100644
--- a/common/m2/repository/net/bytebuddy/byte-buddy/1.4.33/BUILD
+++ b/common/m2/repository/net/bytebuddy/byte-buddy/1.4.33/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/java/dev/javacc/javacc/5.0/BUILD b/common/m2/repository/net/java/dev/javacc/javacc/5.0/BUILD
index b7c1080..eb12bba 100644
--- a/common/m2/repository/net/java/dev/javacc/javacc/5.0/BUILD
+++ b/common/m2/repository/net/java/dev/javacc/javacc/5.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/java/dev/jna/jna/3.4.0/BUILD b/common/m2/repository/net/java/dev/jna/jna/3.4.0/BUILD
index 5c3afdc..ed40bc1 100644
--- a/common/m2/repository/net/java/dev/jna/jna/3.4.0/BUILD
+++ b/common/m2/repository/net/java/dev/jna/jna/3.4.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/java/dev/jna/platform/3.4.0/BUILD b/common/m2/repository/net/java/dev/jna/platform/3.4.0/BUILD
index 5e4cf51..2dc4403 100644
--- a/common/m2/repository/net/java/dev/jna/platform/3.4.0/BUILD
+++ b/common/m2/repository/net/java/dev/jna/platform/3.4.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/java/jvnet-parent/3/BUILD b/common/m2/repository/net/java/jvnet-parent/3/BUILD
index 9137330..35201b4 100644
--- a/common/m2/repository/net/java/jvnet-parent/3/BUILD
+++ b/common/m2/repository/net/java/jvnet-parent/3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/net/java/jvnet-parent/4/BUILD b/common/m2/repository/net/java/jvnet-parent/4/BUILD
index 9023291..223d90f 100644
--- a/common/m2/repository/net/java/jvnet-parent/4/BUILD
+++ b/common/m2/repository/net/java/jvnet-parent/4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/net/jcip/jcip-annotations/1.0/BUILD b/common/m2/repository/net/jcip/jcip-annotations/1.0/BUILD
index 57b17be..de05a15 100644
--- a/common/m2/repository/net/jcip/jcip-annotations/1.0/BUILD
+++ b/common/m2/repository/net/jcip/jcip-annotations/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/orfjackal/retrolambda/parent/2.0.6/BUILD b/common/m2/repository/net/orfjackal/retrolambda/parent/2.0.6/BUILD
index c218304..1dcb9df 100644
--- a/common/m2/repository/net/orfjackal/retrolambda/parent/2.0.6/BUILD
+++ b/common/m2/repository/net/orfjackal/retrolambda/parent/2.0.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/net/orfjackal/retrolambda/retrolambda/2.0.6/BUILD b/common/m2/repository/net/orfjackal/retrolambda/retrolambda/2.0.6/BUILD
index 3bdb593..6958144 100644
--- a/common/m2/repository/net/orfjackal/retrolambda/retrolambda/2.0.6/BUILD
+++ b/common/m2/repository/net/orfjackal/retrolambda/retrolambda/2.0.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sf/ezmorph/ezmorph/1.0.6/BUILD b/common/m2/repository/net/sf/ezmorph/ezmorph/1.0.6/BUILD
index e6b5834..ffbbe21 100644
--- a/common/m2/repository/net/sf/ezmorph/ezmorph/1.0.6/BUILD
+++ b/common/m2/repository/net/sf/ezmorph/ezmorph/1.0.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sf/jopt-simple/jopt-simple/4.9/BUILD b/common/m2/repository/net/sf/jopt-simple/jopt-simple/4.9/BUILD
index 4355322..7e07863 100644
--- a/common/m2/repository/net/sf/jopt-simple/jopt-simple/4.9/BUILD
+++ b/common/m2/repository/net/sf/jopt-simple/jopt-simple/4.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sf/json-lib/json-lib/2.3/BUILD b/common/m2/repository/net/sf/json-lib/json-lib/2.3/BUILD
index 4c5b7b8..d05964a 100644
--- a/common/m2/repository/net/sf/json-lib/json-lib/2.3/BUILD
+++ b/common/m2/repository/net/sf/json-lib/json-lib/2.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sf/kxml/kxml2/2.3.0/BUILD b/common/m2/repository/net/sf/kxml/kxml2/2.3.0/BUILD
index 31ed5a5..53d1c19 100644
--- a/common/m2/repository/net/sf/kxml/kxml2/2.3.0/BUILD
+++ b/common/m2/repository/net/sf/kxml/kxml2/2.3.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sf/proguard/proguard-base/4.10/BUILD b/common/m2/repository/net/sf/proguard/proguard-base/4.10/BUILD
index 42d2a8f..1391311 100644
--- a/common/m2/repository/net/sf/proguard/proguard-base/4.10/BUILD
+++ b/common/m2/repository/net/sf/proguard/proguard-base/4.10/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sf/proguard/proguard-base/4.11/BUILD b/common/m2/repository/net/sf/proguard/proguard-base/4.11/BUILD
index ea22543..18f73f9 100644
--- a/common/m2/repository/net/sf/proguard/proguard-base/4.11/BUILD
+++ b/common/m2/repository/net/sf/proguard/proguard-base/4.11/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sf/proguard/proguard-base/4.9/BUILD b/common/m2/repository/net/sf/proguard/proguard-base/4.9/BUILD
index 6772e58..a617fd7 100644
--- a/common/m2/repository/net/sf/proguard/proguard-base/4.9/BUILD
+++ b/common/m2/repository/net/sf/proguard/proguard-base/4.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sf/proguard/proguard-base/5.1/BUILD b/common/m2/repository/net/sf/proguard/proguard-base/5.1/BUILD
index e2f326f..af5df1e 100644
--- a/common/m2/repository/net/sf/proguard/proguard-base/5.1/BUILD
+++ b/common/m2/repository/net/sf/proguard/proguard-base/5.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sf/proguard/proguard-base/5.2.1/BUILD b/common/m2/repository/net/sf/proguard/proguard-base/5.2.1/BUILD
index a124f34..978e5ea 100644
--- a/common/m2/repository/net/sf/proguard/proguard-base/5.2.1/BUILD
+++ b/common/m2/repository/net/sf/proguard/proguard-base/5.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sf/proguard/proguard-base/5.3.1/BUILD b/common/m2/repository/net/sf/proguard/proguard-base/5.3.1/BUILD
index b7fe28f..42ed91c 100644
--- a/common/m2/repository/net/sf/proguard/proguard-base/5.3.1/BUILD
+++ b/common/m2/repository/net/sf/proguard/proguard-base/5.3.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sf/proguard/proguard-base/5.3.2/BUILD b/common/m2/repository/net/sf/proguard/proguard-base/5.3.2/BUILD
index b573119..be5e963 100644
--- a/common/m2/repository/net/sf/proguard/proguard-base/5.3.2/BUILD
+++ b/common/m2/repository/net/sf/proguard/proguard-base/5.3.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sf/proguard/proguard-gradle/4.10/BUILD b/common/m2/repository/net/sf/proguard/proguard-gradle/4.10/BUILD
index 3db72ea..8d798ec 100644
--- a/common/m2/repository/net/sf/proguard/proguard-gradle/4.10/BUILD
+++ b/common/m2/repository/net/sf/proguard/proguard-gradle/4.10/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sf/proguard/proguard-gradle/4.11/BUILD b/common/m2/repository/net/sf/proguard/proguard-gradle/4.11/BUILD
index f52467d..4712dd5 100644
--- a/common/m2/repository/net/sf/proguard/proguard-gradle/4.11/BUILD
+++ b/common/m2/repository/net/sf/proguard/proguard-gradle/4.11/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sf/proguard/proguard-gradle/4.9/BUILD b/common/m2/repository/net/sf/proguard/proguard-gradle/4.9/BUILD
index 6783015..8dc4654 100644
--- a/common/m2/repository/net/sf/proguard/proguard-gradle/4.9/BUILD
+++ b/common/m2/repository/net/sf/proguard/proguard-gradle/4.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sf/proguard/proguard-gradle/5.1/BUILD b/common/m2/repository/net/sf/proguard/proguard-gradle/5.1/BUILD
index 1d25ce8..61b4710 100644
--- a/common/m2/repository/net/sf/proguard/proguard-gradle/5.1/BUILD
+++ b/common/m2/repository/net/sf/proguard/proguard-gradle/5.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sf/proguard/proguard-gradle/5.2.1/BUILD b/common/m2/repository/net/sf/proguard/proguard-gradle/5.2.1/BUILD
index 37f5e48..c4908bc 100644
--- a/common/m2/repository/net/sf/proguard/proguard-gradle/5.2.1/BUILD
+++ b/common/m2/repository/net/sf/proguard/proguard-gradle/5.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sf/proguard/proguard-gradle/5.3.1/BUILD b/common/m2/repository/net/sf/proguard/proguard-gradle/5.3.1/BUILD
index 1005482..bd66821 100644
--- a/common/m2/repository/net/sf/proguard/proguard-gradle/5.3.1/BUILD
+++ b/common/m2/repository/net/sf/proguard/proguard-gradle/5.3.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sf/proguard/proguard-gradle/5.3.2/BUILD b/common/m2/repository/net/sf/proguard/proguard-gradle/5.3.2/BUILD
index 1f9d6e9..b5b4e67 100644
--- a/common/m2/repository/net/sf/proguard/proguard-gradle/5.3.2/BUILD
+++ b/common/m2/repository/net/sf/proguard/proguard-gradle/5.3.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sf/proguard/proguard-parent/4.10/BUILD b/common/m2/repository/net/sf/proguard/proguard-parent/4.10/BUILD
index c3397b6..243d50f 100644
--- a/common/m2/repository/net/sf/proguard/proguard-parent/4.10/BUILD
+++ b/common/m2/repository/net/sf/proguard/proguard-parent/4.10/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/net/sf/proguard/proguard-parent/4.11/BUILD b/common/m2/repository/net/sf/proguard/proguard-parent/4.11/BUILD
index f900534..19520a0 100644
--- a/common/m2/repository/net/sf/proguard/proguard-parent/4.11/BUILD
+++ b/common/m2/repository/net/sf/proguard/proguard-parent/4.11/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/net/sf/proguard/proguard-parent/4.9/BUILD b/common/m2/repository/net/sf/proguard/proguard-parent/4.9/BUILD
index b404ecf..170b768 100644
--- a/common/m2/repository/net/sf/proguard/proguard-parent/4.9/BUILD
+++ b/common/m2/repository/net/sf/proguard/proguard-parent/4.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/net/sf/proguard/proguard-parent/5.1/BUILD b/common/m2/repository/net/sf/proguard/proguard-parent/5.1/BUILD
index 405df50..56ff6e0 100644
--- a/common/m2/repository/net/sf/proguard/proguard-parent/5.1/BUILD
+++ b/common/m2/repository/net/sf/proguard/proguard-parent/5.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/net/sf/proguard/proguard-parent/5.2.1/BUILD b/common/m2/repository/net/sf/proguard/proguard-parent/5.2.1/BUILD
index cf65775..53b35c7 100644
--- a/common/m2/repository/net/sf/proguard/proguard-parent/5.2.1/BUILD
+++ b/common/m2/repository/net/sf/proguard/proguard-parent/5.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/net/sf/proguard/proguard-parent/5.3.1/BUILD b/common/m2/repository/net/sf/proguard/proguard-parent/5.3.1/BUILD
index aec34aa..d21a637 100644
--- a/common/m2/repository/net/sf/proguard/proguard-parent/5.3.1/BUILD
+++ b/common/m2/repository/net/sf/proguard/proguard-parent/5.3.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/net/sf/proguard/proguard-parent/5.3.2/BUILD b/common/m2/repository/net/sf/proguard/proguard-parent/5.3.2/BUILD
index 965b416..b87a00f 100644
--- a/common/m2/repository/net/sf/proguard/proguard-parent/5.3.2/BUILD
+++ b/common/m2/repository/net/sf/proguard/proguard-parent/5.3.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/net/sf/trove4j/trove4j/1.1/BUILD b/common/m2/repository/net/sf/trove4j/trove4j/1.1/BUILD
index 25c7075..86b50a5 100644
--- a/common/m2/repository/net/sf/trove4j/trove4j/1.1/BUILD
+++ b/common/m2/repository/net/sf/trove4j/trove4j/1.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sourceforge/cssparser/cssparser/0.9.13/BUILD b/common/m2/repository/net/sourceforge/cssparser/cssparser/0.9.13/BUILD
index 2e58ac8..f058b8f 100644
--- a/common/m2/repository/net/sourceforge/cssparser/cssparser/0.9.13/BUILD
+++ b/common/m2/repository/net/sourceforge/cssparser/cssparser/0.9.13/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sourceforge/htmlunit/htmlunit-core-js/2.14/BUILD b/common/m2/repository/net/sourceforge/htmlunit/htmlunit-core-js/2.14/BUILD
index 0294ea1..c9e918b 100644
--- a/common/m2/repository/net/sourceforge/htmlunit/htmlunit-core-js/2.14/BUILD
+++ b/common/m2/repository/net/sourceforge/htmlunit/htmlunit-core-js/2.14/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sourceforge/htmlunit/htmlunit/2.14/BUILD b/common/m2/repository/net/sourceforge/htmlunit/htmlunit/2.14/BUILD
index b730279..f03ceff 100644
--- a/common/m2/repository/net/sourceforge/htmlunit/htmlunit/2.14/BUILD
+++ b/common/m2/repository/net/sourceforge/htmlunit/htmlunit/2.14/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sourceforge/nekohtml/nekohtml/1.9.16/BUILD b/common/m2/repository/net/sourceforge/nekohtml/nekohtml/1.9.16/BUILD
index 97ba184..3528ef0 100644
--- a/common/m2/repository/net/sourceforge/nekohtml/nekohtml/1.9.16/BUILD
+++ b/common/m2/repository/net/sourceforge/nekohtml/nekohtml/1.9.16/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sourceforge/nekohtml/nekohtml/1.9.20/BUILD b/common/m2/repository/net/sourceforge/nekohtml/nekohtml/1.9.20/BUILD
index 8b2fa6c..7b8de0e 100644
--- a/common/m2/repository/net/sourceforge/nekohtml/nekohtml/1.9.20/BUILD
+++ b/common/m2/repository/net/sourceforge/nekohtml/nekohtml/1.9.20/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sourceforge/pmd/pmd/5.1.1/BUILD b/common/m2/repository/net/sourceforge/pmd/pmd/5.1.1/BUILD
index 90e2c31..0bd14f5 100644
--- a/common/m2/repository/net/sourceforge/pmd/pmd/5.1.1/BUILD
+++ b/common/m2/repository/net/sourceforge/pmd/pmd/5.1.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/net/sourceforge/saxon/saxon/9.1.0.8/BUILD b/common/m2/repository/net/sourceforge/saxon/saxon/9.1.0.8/BUILD
index 76d4320..52e4f97 100644
--- a/common/m2/repository/net/sourceforge/saxon/saxon/9.1.0.8/BUILD
+++ b/common/m2/repository/net/sourceforge/saxon/saxon/9.1.0.8/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/nl/jqno/equalsverifier/equalsverifier/2.1.5/BUILD b/common/m2/repository/nl/jqno/equalsverifier/equalsverifier/2.1.5/BUILD
index 74e902b..135de69 100644
--- a/common/m2/repository/nl/jqno/equalsverifier/equalsverifier/2.1.5/BUILD
+++ b/common/m2/repository/nl/jqno/equalsverifier/equalsverifier/2.1.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/abego/treelayout/org.abego.treelayout.core/1.0.1/BUILD b/common/m2/repository/org/abego/treelayout/org.abego.treelayout.core/1.0.1/BUILD
index 0f75562..d368644 100644
--- a/common/m2/repository/org/abego/treelayout/org.abego.treelayout.core/1.0.1/BUILD
+++ b/common/m2/repository/org/abego/treelayout/org.abego.treelayout.core/1.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/anarres/jarjar/jarjar-command/1.0.0/BUILD b/common/m2/repository/org/anarres/jarjar/jarjar-command/1.0.0/BUILD
index b9100f1..6af67da 100644
--- a/common/m2/repository/org/anarres/jarjar/jarjar-command/1.0.0/BUILD
+++ b/common/m2/repository/org/anarres/jarjar/jarjar-command/1.0.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/anarres/jarjar/jarjar-core/1.0.0/BUILD b/common/m2/repository/org/anarres/jarjar/jarjar-core/1.0.0/BUILD
index a2079bc..79a4046 100644
--- a/common/m2/repository/org/anarres/jarjar/jarjar-core/1.0.0/BUILD
+++ b/common/m2/repository/org/anarres/jarjar/jarjar-core/1.0.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/anarres/jarjar/jarjar-gradle/1.0.0/BUILD b/common/m2/repository/org/anarres/jarjar/jarjar-gradle/1.0.0/BUILD
index 7600524..a577d10 100644
--- a/common/m2/repository/org/anarres/jarjar/jarjar-gradle/1.0.0/BUILD
+++ b/common/m2/repository/org/anarres/jarjar/jarjar-gradle/1.0.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/antlr/ST4/4.0.8/BUILD b/common/m2/repository/org/antlr/ST4/4.0.8/BUILD
index 70430ce..cb2c0a4 100644
--- a/common/m2/repository/org/antlr/ST4/4.0.8/BUILD
+++ b/common/m2/repository/org/antlr/ST4/4.0.8/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/antlr/antlr-master/3.5.2/BUILD b/common/m2/repository/org/antlr/antlr-master/3.5.2/BUILD
index 2545649..eca45ed 100644
--- a/common/m2/repository/org/antlr/antlr-master/3.5.2/BUILD
+++ b/common/m2/repository/org/antlr/antlr-master/3.5.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/antlr/antlr-runtime/3.5.2/BUILD b/common/m2/repository/org/antlr/antlr-runtime/3.5.2/BUILD
index 9313de1..b1b8f80 100644
--- a/common/m2/repository/org/antlr/antlr-runtime/3.5.2/BUILD
+++ b/common/m2/repository/org/antlr/antlr-runtime/3.5.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/antlr/antlr/3.5.2/BUILD b/common/m2/repository/org/antlr/antlr/3.5.2/BUILD
index 48c82f3..f70199c 100644
--- a/common/m2/repository/org/antlr/antlr/3.5.2/BUILD
+++ b/common/m2/repository/org/antlr/antlr/3.5.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/antlr/antlr4-master/4.5.3/BUILD b/common/m2/repository/org/antlr/antlr4-master/4.5.3/BUILD
index 9716b44..fcc4cd9 100644
--- a/common/m2/repository/org/antlr/antlr4-master/4.5.3/BUILD
+++ b/common/m2/repository/org/antlr/antlr4-master/4.5.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/antlr/antlr4/4.5.3/BUILD b/common/m2/repository/org/antlr/antlr4/4.5.3/BUILD
index b377302..b54b420 100644
--- a/common/m2/repository/org/antlr/antlr4/4.5.3/BUILD
+++ b/common/m2/repository/org/antlr/antlr4/4.5.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/antlr/stringtemplate/3.2.1/BUILD b/common/m2/repository/org/antlr/stringtemplate/3.2.1/BUILD
index f6eb0ab..8ba6e9e 100644
--- a/common/m2/repository/org/antlr/stringtemplate/3.2.1/BUILD
+++ b/common/m2/repository/org/antlr/stringtemplate/3.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/ant/ant-launcher/1.7.0/BUILD b/common/m2/repository/org/apache/ant/ant-launcher/1.7.0/BUILD
index 20d35ae..b642c21 100644
--- a/common/m2/repository/org/apache/ant/ant-launcher/1.7.0/BUILD
+++ b/common/m2/repository/org/apache/ant/ant-launcher/1.7.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/ant/ant-launcher/1.8.0/BUILD b/common/m2/repository/org/apache/ant/ant-launcher/1.8.0/BUILD
index 745838d..46977d3 100644
--- a/common/m2/repository/org/apache/ant/ant-launcher/1.8.0/BUILD
+++ b/common/m2/repository/org/apache/ant/ant-launcher/1.8.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/ant/ant-launcher/1.8.2/BUILD b/common/m2/repository/org/apache/ant/ant-launcher/1.8.2/BUILD
index bce1841..5d511b5 100644
--- a/common/m2/repository/org/apache/ant/ant-launcher/1.8.2/BUILD
+++ b/common/m2/repository/org/apache/ant/ant-launcher/1.8.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/ant/ant-parent/1.7.0/BUILD b/common/m2/repository/org/apache/ant/ant-parent/1.7.0/BUILD
index 859d191..ca18ae8 100644
--- a/common/m2/repository/org/apache/ant/ant-parent/1.7.0/BUILD
+++ b/common/m2/repository/org/apache/ant/ant-parent/1.7.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/ant/ant-parent/1.8.0/BUILD b/common/m2/repository/org/apache/ant/ant-parent/1.8.0/BUILD
index ec6d386..b4801df 100644
--- a/common/m2/repository/org/apache/ant/ant-parent/1.8.0/BUILD
+++ b/common/m2/repository/org/apache/ant/ant-parent/1.8.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/ant/ant-parent/1.8.2/BUILD b/common/m2/repository/org/apache/ant/ant-parent/1.8.2/BUILD
index 45614c9..56c9f2b 100644
--- a/common/m2/repository/org/apache/ant/ant-parent/1.8.2/BUILD
+++ b/common/m2/repository/org/apache/ant/ant-parent/1.8.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/ant/ant-testutil/1.8.2/BUILD b/common/m2/repository/org/apache/ant/ant-testutil/1.8.2/BUILD
index 4b8c052..b296475 100644
--- a/common/m2/repository/org/apache/ant/ant-testutil/1.8.2/BUILD
+++ b/common/m2/repository/org/apache/ant/ant-testutil/1.8.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/ant/ant/1.7.0/BUILD b/common/m2/repository/org/apache/ant/ant/1.7.0/BUILD
index a3f5119..e7ce031 100644
--- a/common/m2/repository/org/apache/ant/ant/1.7.0/BUILD
+++ b/common/m2/repository/org/apache/ant/ant/1.7.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/ant/ant/1.8.0/BUILD b/common/m2/repository/org/apache/ant/ant/1.8.0/BUILD
index bab2c62..3aac75c 100644
--- a/common/m2/repository/org/apache/ant/ant/1.8.0/BUILD
+++ b/common/m2/repository/org/apache/ant/ant/1.8.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/ant/ant/1.8.2/BUILD b/common/m2/repository/org/apache/ant/ant/1.8.2/BUILD
index 07b69fe..8355a0d 100644
--- a/common/m2/repository/org/apache/ant/ant/1.8.2/BUILD
+++ b/common/m2/repository/org/apache/ant/ant/1.8.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/apache/10/BUILD b/common/m2/repository/org/apache/apache/10/BUILD
index fb7cfcd..38c1b24 100644
--- a/common/m2/repository/org/apache/apache/10/BUILD
+++ b/common/m2/repository/org/apache/apache/10/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/apache/11/BUILD b/common/m2/repository/org/apache/apache/11/BUILD
index 175f458..d83ee2d 100644
--- a/common/m2/repository/org/apache/apache/11/BUILD
+++ b/common/m2/repository/org/apache/apache/11/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/apache/13/BUILD b/common/m2/repository/org/apache/apache/13/BUILD
index d71a904..b6393ff 100644
--- a/common/m2/repository/org/apache/apache/13/BUILD
+++ b/common/m2/repository/org/apache/apache/13/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/apache/15/BUILD b/common/m2/repository/org/apache/apache/15/BUILD
index d1ab264..835c51e 100644
--- a/common/m2/repository/org/apache/apache/15/BUILD
+++ b/common/m2/repository/org/apache/apache/15/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/apache/16/BUILD b/common/m2/repository/org/apache/apache/16/BUILD
index f4c1f10..e781404 100644
--- a/common/m2/repository/org/apache/apache/16/BUILD
+++ b/common/m2/repository/org/apache/apache/16/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/apache/17/BUILD b/common/m2/repository/org/apache/apache/17/BUILD
index 1e9daa5..f83d4a3 100644
--- a/common/m2/repository/org/apache/apache/17/BUILD
+++ b/common/m2/repository/org/apache/apache/17/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/apache/3/BUILD b/common/m2/repository/org/apache/apache/3/BUILD
index 935aaf3..9200bd7 100644
--- a/common/m2/repository/org/apache/apache/3/BUILD
+++ b/common/m2/repository/org/apache/apache/3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/apache/4/BUILD b/common/m2/repository/org/apache/apache/4/BUILD
index 5e0c923..9b29d22 100644
--- a/common/m2/repository/org/apache/apache/4/BUILD
+++ b/common/m2/repository/org/apache/apache/4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/apache/5/BUILD b/common/m2/repository/org/apache/apache/5/BUILD
index 9d2dc14..6114176 100644
--- a/common/m2/repository/org/apache/apache/5/BUILD
+++ b/common/m2/repository/org/apache/apache/5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/apache/6/BUILD b/common/m2/repository/org/apache/apache/6/BUILD
index 5a1ed80..a81aaf9 100644
--- a/common/m2/repository/org/apache/apache/6/BUILD
+++ b/common/m2/repository/org/apache/apache/6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/apache/7/BUILD b/common/m2/repository/org/apache/apache/7/BUILD
index 34252f4..17985b9 100644
--- a/common/m2/repository/org/apache/apache/7/BUILD
+++ b/common/m2/repository/org/apache/apache/7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/apache/9/BUILD b/common/m2/repository/org/apache/apache/9/BUILD
index 420ffcd..1f80bab 100644
--- a/common/m2/repository/org/apache/apache/9/BUILD
+++ b/common/m2/repository/org/apache/apache/9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/commons/commons-compress/1.0/BUILD b/common/m2/repository/org/apache/commons/commons-compress/1.0/BUILD
index 1a59672..190c26e 100644
--- a/common/m2/repository/org/apache/commons/commons-compress/1.0/BUILD
+++ b/common/m2/repository/org/apache/commons/commons-compress/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/commons/commons-compress/1.8.1/BUILD b/common/m2/repository/org/apache/commons/commons-compress/1.8.1/BUILD
index 67c0d14..c7ce0d6 100644
--- a/common/m2/repository/org/apache/commons/commons-compress/1.8.1/BUILD
+++ b/common/m2/repository/org/apache/commons/commons-compress/1.8.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/commons/commons-compress/1.9/BUILD b/common/m2/repository/org/apache/commons/commons-compress/1.9/BUILD
index 3f84d68..d5b332e 100644
--- a/common/m2/repository/org/apache/commons/commons-compress/1.9/BUILD
+++ b/common/m2/repository/org/apache/commons/commons-compress/1.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/commons/commons-exec/1.1/BUILD b/common/m2/repository/org/apache/commons/commons-exec/1.1/BUILD
index e2dbfec..a26e9c0 100644
--- a/common/m2/repository/org/apache/commons/commons-exec/1.1/BUILD
+++ b/common/m2/repository/org/apache/commons/commons-exec/1.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/commons/commons-lang3/3.2.1/BUILD b/common/m2/repository/org/apache/commons/commons-lang3/3.2.1/BUILD
index 5d11465..ac35be9 100644
--- a/common/m2/repository/org/apache/commons/commons-lang3/3.2.1/BUILD
+++ b/common/m2/repository/org/apache/commons/commons-lang3/3.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/commons/commons-lang3/3.3.2/BUILD b/common/m2/repository/org/apache/commons/commons-lang3/3.3.2/BUILD
index 32df06f..0342efc 100644
--- a/common/m2/repository/org/apache/commons/commons-lang3/3.3.2/BUILD
+++ b/common/m2/repository/org/apache/commons/commons-lang3/3.3.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/commons/commons-lang3/3.3/BUILD b/common/m2/repository/org/apache/commons/commons-lang3/3.3/BUILD
index 4a93281..b6e959e 100644
--- a/common/m2/repository/org/apache/commons/commons-lang3/3.3/BUILD
+++ b/common/m2/repository/org/apache/commons/commons-lang3/3.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/commons/commons-lang3/3.4/BUILD b/common/m2/repository/org/apache/commons/commons-lang3/3.4/BUILD
index b68fe85..3af5310 100644
--- a/common/m2/repository/org/apache/commons/commons-lang3/3.4/BUILD
+++ b/common/m2/repository/org/apache/commons/commons-lang3/3.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/commons/commons-parent/11/BUILD b/common/m2/repository/org/apache/commons/commons-parent/11/BUILD
index cef1c67..5d75ac6 100644
--- a/common/m2/repository/org/apache/commons/commons-parent/11/BUILD
+++ b/common/m2/repository/org/apache/commons/commons-parent/11/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/commons/commons-parent/17/BUILD b/common/m2/repository/org/apache/commons/commons-parent/17/BUILD
index 35be3a8..f25fe7c 100644
--- a/common/m2/repository/org/apache/commons/commons-parent/17/BUILD
+++ b/common/m2/repository/org/apache/commons/commons-parent/17/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/commons/commons-parent/22/BUILD b/common/m2/repository/org/apache/commons/commons-parent/22/BUILD
index 747c6e1..617bce0 100644
--- a/common/m2/repository/org/apache/commons/commons-parent/22/BUILD
+++ b/common/m2/repository/org/apache/commons/commons-parent/22/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/commons/commons-parent/25/BUILD b/common/m2/repository/org/apache/commons/commons-parent/25/BUILD
index d58a2ce..83053c9 100644
--- a/common/m2/repository/org/apache/commons/commons-parent/25/BUILD
+++ b/common/m2/repository/org/apache/commons/commons-parent/25/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/commons/commons-parent/28/BUILD b/common/m2/repository/org/apache/commons/commons-parent/28/BUILD
index 9444c37..503e2d7 100644
--- a/common/m2/repository/org/apache/commons/commons-parent/28/BUILD
+++ b/common/m2/repository/org/apache/commons/commons-parent/28/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/commons/commons-parent/3/BUILD b/common/m2/repository/org/apache/commons/commons-parent/3/BUILD
index c73d81a..2ea1280 100644
--- a/common/m2/repository/org/apache/commons/commons-parent/3/BUILD
+++ b/common/m2/repository/org/apache/commons/commons-parent/3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/commons/commons-parent/32/BUILD b/common/m2/repository/org/apache/commons/commons-parent/32/BUILD
index 55a2f97..95c9979 100644
--- a/common/m2/repository/org/apache/commons/commons-parent/32/BUILD
+++ b/common/m2/repository/org/apache/commons/commons-parent/32/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/commons/commons-parent/33/BUILD b/common/m2/repository/org/apache/commons/commons-parent/33/BUILD
index bc62114..58434f4 100644
--- a/common/m2/repository/org/apache/commons/commons-parent/33/BUILD
+++ b/common/m2/repository/org/apache/commons/commons-parent/33/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/commons/commons-parent/34/BUILD b/common/m2/repository/org/apache/commons/commons-parent/34/BUILD
index 2260685..4c8e002 100644
--- a/common/m2/repository/org/apache/commons/commons-parent/34/BUILD
+++ b/common/m2/repository/org/apache/commons/commons-parent/34/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/commons/commons-parent/35/BUILD b/common/m2/repository/org/apache/commons/commons-parent/35/BUILD
index ac830ae..7529454 100644
--- a/common/m2/repository/org/apache/commons/commons-parent/35/BUILD
+++ b/common/m2/repository/org/apache/commons/commons-parent/35/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/commons/commons-parent/37/BUILD b/common/m2/repository/org/apache/commons/commons-parent/37/BUILD
index 1ee681a..d9c80ad 100644
--- a/common/m2/repository/org/apache/commons/commons-parent/37/BUILD
+++ b/common/m2/repository/org/apache/commons/commons-parent/37/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/commons/commons-parent/39/BUILD b/common/m2/repository/org/apache/commons/commons-parent/39/BUILD
index fbba058..a24107d 100644
--- a/common/m2/repository/org/apache/commons/commons-parent/39/BUILD
+++ b/common/m2/repository/org/apache/commons/commons-parent/39/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/commons/commons-parent/5/BUILD b/common/m2/repository/org/apache/commons/commons-parent/5/BUILD
index 03a99d7..1ab0568 100644
--- a/common/m2/repository/org/apache/commons/commons-parent/5/BUILD
+++ b/common/m2/repository/org/apache/commons/commons-parent/5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/commons/commons-parent/7/BUILD b/common/m2/repository/org/apache/commons/commons-parent/7/BUILD
index 3ed8963..670dc63 100644
--- a/common/m2/repository/org/apache/commons/commons-parent/7/BUILD
+++ b/common/m2/repository/org/apache/commons/commons-parent/7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/commons/commons-parent/9/BUILD b/common/m2/repository/org/apache/commons/commons-parent/9/BUILD
index 9a21ef4..cbcbe87 100644
--- a/common/m2/repository/org/apache/commons/commons-parent/9/BUILD
+++ b/common/m2/repository/org/apache/commons/commons-parent/9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/felix/felix-parent/2.1/BUILD b/common/m2/repository/org/apache/felix/felix-parent/2.1/BUILD
index 4b8a6bd..3ca67bc 100644
--- a/common/m2/repository/org/apache/felix/felix-parent/2.1/BUILD
+++ b/common/m2/repository/org/apache/felix/felix-parent/2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/felix/maven-bundle-plugin/2.3.6/BUILD b/common/m2/repository/org/apache/felix/maven-bundle-plugin/2.3.6/BUILD
index 235fcc0..4384cb1 100644
--- a/common/m2/repository/org/apache/felix/maven-bundle-plugin/2.3.6/BUILD
+++ b/common/m2/repository/org/apache/felix/maven-bundle-plugin/2.3.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/BUILD b/common/m2/repository/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/BUILD
index 89a5db1..eb01ab1 100644
--- a/common/m2/repository/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/BUILD
+++ b/common/m2/repository/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/httpcomponents/httpclient/4.0.1/BUILD b/common/m2/repository/org/apache/httpcomponents/httpclient/4.0.1/BUILD
index 5db0d5c..07ad130 100644
--- a/common/m2/repository/org/apache/httpcomponents/httpclient/4.0.1/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/httpclient/4.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/httpcomponents/httpclient/4.0.3/BUILD b/common/m2/repository/org/apache/httpcomponents/httpclient/4.0.3/BUILD
index 8c0966b..341923f 100644
--- a/common/m2/repository/org/apache/httpcomponents/httpclient/4.0.3/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/httpclient/4.0.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/httpcomponents/httpclient/4.1.1/BUILD b/common/m2/repository/org/apache/httpcomponents/httpclient/4.1.1/BUILD
index 12252e6..647316d 100644
--- a/common/m2/repository/org/apache/httpcomponents/httpclient/4.1.1/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/httpclient/4.1.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/httpcomponents/httpclient/4.2.1/BUILD b/common/m2/repository/org/apache/httpcomponents/httpclient/4.2.1/BUILD
index 9e44535..7d9efc5 100644
--- a/common/m2/repository/org/apache/httpcomponents/httpclient/4.2.1/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/httpclient/4.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/httpcomponents/httpclient/4.2.6/BUILD b/common/m2/repository/org/apache/httpcomponents/httpclient/4.2.6/BUILD
index c58d1ec..b4a8b80 100644
--- a/common/m2/repository/org/apache/httpcomponents/httpclient/4.2.6/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/httpclient/4.2.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/httpcomponents/httpclient/4.3.2/BUILD b/common/m2/repository/org/apache/httpcomponents/httpclient/4.3.2/BUILD
index da49852..9520be0 100644
--- a/common/m2/repository/org/apache/httpcomponents/httpclient/4.3.2/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/httpclient/4.3.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.0.1/BUILD b/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.0.1/BUILD
index 8155b2a..93e349b 100644
--- a/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.0.1/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.0.3/BUILD b/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.0.3/BUILD
index 82d6b82..d4ef2bf 100644
--- a/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.0.3/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.0.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.1.1/BUILD b/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.1.1/BUILD
index ffae89d..b44482f 100644
--- a/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.1.1/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.1.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.1/BUILD b/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.1/BUILD
index 59312dc..b1267ea 100644
--- a/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.1/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.2.1/BUILD b/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.2.1/BUILD
index f03b610..6415764 100644
--- a/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.2.1/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.2.6/BUILD b/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.2.6/BUILD
index f6e65da..a29dd42 100644
--- a/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.2.6/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.2.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.3.2/BUILD b/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.3.2/BUILD
index 54e005f..15ea6e0 100644
--- a/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.3.2/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/httpcomponents-client/4.3.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/httpcomponents/httpcomponents-core/4.0.1/BUILD b/common/m2/repository/org/apache/httpcomponents/httpcomponents-core/4.0.1/BUILD
index 4f274d1..e1d714b 100644
--- a/common/m2/repository/org/apache/httpcomponents/httpcomponents-core/4.0.1/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/httpcomponents-core/4.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/httpcomponents/httpcomponents-core/4.1/BUILD b/common/m2/repository/org/apache/httpcomponents/httpcomponents-core/4.1/BUILD
index 6a99428..8f3c1c8 100644
--- a/common/m2/repository/org/apache/httpcomponents/httpcomponents-core/4.1/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/httpcomponents-core/4.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/httpcomponents/httpcomponents-core/4.2.1/BUILD b/common/m2/repository/org/apache/httpcomponents/httpcomponents-core/4.2.1/BUILD
index c06b62e..63bafe4 100644
--- a/common/m2/repository/org/apache/httpcomponents/httpcomponents-core/4.2.1/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/httpcomponents-core/4.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/httpcomponents/httpcomponents-core/4.2.5/BUILD b/common/m2/repository/org/apache/httpcomponents/httpcomponents-core/4.2.5/BUILD
index 616e8e1..0ec5ec5 100644
--- a/common/m2/repository/org/apache/httpcomponents/httpcomponents-core/4.2.5/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/httpcomponents-core/4.2.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/httpcomponents/httpcomponents-core/4.3.1/BUILD b/common/m2/repository/org/apache/httpcomponents/httpcomponents-core/4.3.1/BUILD
index a7b55a2..399af3d 100644
--- a/common/m2/repository/org/apache/httpcomponents/httpcomponents-core/4.3.1/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/httpcomponents-core/4.3.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/httpcomponents/httpcore/4.0.1/BUILD b/common/m2/repository/org/apache/httpcomponents/httpcore/4.0.1/BUILD
index c7e0a9b..ca7fff1 100644
--- a/common/m2/repository/org/apache/httpcomponents/httpcore/4.0.1/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/httpcore/4.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/httpcomponents/httpcore/4.1/BUILD b/common/m2/repository/org/apache/httpcomponents/httpcore/4.1/BUILD
index c3a613f..360fe87 100644
--- a/common/m2/repository/org/apache/httpcomponents/httpcore/4.1/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/httpcore/4.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/httpcomponents/httpcore/4.2.1/BUILD b/common/m2/repository/org/apache/httpcomponents/httpcore/4.2.1/BUILD
index 1f0e092..cd45ce3 100644
--- a/common/m2/repository/org/apache/httpcomponents/httpcore/4.2.1/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/httpcore/4.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/httpcomponents/httpcore/4.2.5/BUILD b/common/m2/repository/org/apache/httpcomponents/httpcore/4.2.5/BUILD
index e54893c..496b96c 100644
--- a/common/m2/repository/org/apache/httpcomponents/httpcore/4.2.5/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/httpcore/4.2.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/httpcomponents/httpcore/4.3.1/BUILD b/common/m2/repository/org/apache/httpcomponents/httpcore/4.3.1/BUILD
index b741ced..c470936 100644
--- a/common/m2/repository/org/apache/httpcomponents/httpcore/4.3.1/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/httpcore/4.3.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/httpcomponents/httpmime/4.1/BUILD b/common/m2/repository/org/apache/httpcomponents/httpmime/4.1/BUILD
index d144f8f..d07b63f 100644
--- a/common/m2/repository/org/apache/httpcomponents/httpmime/4.1/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/httpmime/4.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/httpcomponents/httpmime/4.3.2/BUILD b/common/m2/repository/org/apache/httpcomponents/httpmime/4.3.2/BUILD
index debadcd..d81c13b 100644
--- a/common/m2/repository/org/apache/httpcomponents/httpmime/4.3.2/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/httpmime/4.3.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/httpcomponents/project/4.0/BUILD b/common/m2/repository/org/apache/httpcomponents/project/4.0/BUILD
index df82e70..999a35b 100644
--- a/common/m2/repository/org/apache/httpcomponents/project/4.0/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/project/4.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/httpcomponents/project/4.1.1/BUILD b/common/m2/repository/org/apache/httpcomponents/project/4.1.1/BUILD
index e78dc39..9749751 100644
--- a/common/m2/repository/org/apache/httpcomponents/project/4.1.1/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/project/4.1.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/httpcomponents/project/4.1/BUILD b/common/m2/repository/org/apache/httpcomponents/project/4.1/BUILD
index 1dd35cf..7ef9004 100644
--- a/common/m2/repository/org/apache/httpcomponents/project/4.1/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/project/4.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/httpcomponents/project/6/BUILD b/common/m2/repository/org/apache/httpcomponents/project/6/BUILD
index 76b3c79..df5ec7e 100644
--- a/common/m2/repository/org/apache/httpcomponents/project/6/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/project/6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/httpcomponents/project/7/BUILD b/common/m2/repository/org/apache/httpcomponents/project/7/BUILD
index 055828e..b0bde13 100644
--- a/common/m2/repository/org/apache/httpcomponents/project/7/BUILD
+++ b/common/m2/repository/org/apache/httpcomponents/project/7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/doxia/doxia-core/1.0/BUILD b/common/m2/repository/org/apache/maven/doxia/doxia-core/1.0/BUILD
index 83c3032..83bebcb 100644
--- a/common/m2/repository/org/apache/maven/doxia/doxia-core/1.0/BUILD
+++ b/common/m2/repository/org/apache/maven/doxia/doxia-core/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/doxia/doxia-decoration-model/1.0/BUILD b/common/m2/repository/org/apache/maven/doxia/doxia-decoration-model/1.0/BUILD
index 7844207..4361ad4 100644
--- a/common/m2/repository/org/apache/maven/doxia/doxia-decoration-model/1.0/BUILD
+++ b/common/m2/repository/org/apache/maven/doxia/doxia-decoration-model/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/doxia/doxia-module-apt/1.0/BUILD b/common/m2/repository/org/apache/maven/doxia/doxia-module-apt/1.0/BUILD
index 67ca4ae..bbf8c1c 100644
--- a/common/m2/repository/org/apache/maven/doxia/doxia-module-apt/1.0/BUILD
+++ b/common/m2/repository/org/apache/maven/doxia/doxia-module-apt/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/doxia/doxia-module-fml/1.0/BUILD b/common/m2/repository/org/apache/maven/doxia/doxia-module-fml/1.0/BUILD
index 2c367ed..4cd7a32 100644
--- a/common/m2/repository/org/apache/maven/doxia/doxia-module-fml/1.0/BUILD
+++ b/common/m2/repository/org/apache/maven/doxia/doxia-module-fml/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/doxia/doxia-module-xdoc/1.0/BUILD b/common/m2/repository/org/apache/maven/doxia/doxia-module-xdoc/1.0/BUILD
index 66d3862..e7501f9 100644
--- a/common/m2/repository/org/apache/maven/doxia/doxia-module-xdoc/1.0/BUILD
+++ b/common/m2/repository/org/apache/maven/doxia/doxia-module-xdoc/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/doxia/doxia-module-xhtml/1.0/BUILD b/common/m2/repository/org/apache/maven/doxia/doxia-module-xhtml/1.0/BUILD
index de43657..6111272 100644
--- a/common/m2/repository/org/apache/maven/doxia/doxia-module-xhtml/1.0/BUILD
+++ b/common/m2/repository/org/apache/maven/doxia/doxia-module-xhtml/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/doxia/doxia-modules/1.0/BUILD b/common/m2/repository/org/apache/maven/doxia/doxia-modules/1.0/BUILD
index 406ad81..2ba3b06 100644
--- a/common/m2/repository/org/apache/maven/doxia/doxia-modules/1.0/BUILD
+++ b/common/m2/repository/org/apache/maven/doxia/doxia-modules/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/BUILD b/common/m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/BUILD
index ec3c8a2..375bf3f 100644
--- a/common/m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/BUILD
+++ b/common/m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/BUILD b/common/m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/BUILD
index a513ed4..92606ce 100644
--- a/common/m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/BUILD
+++ b/common/m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0/BUILD b/common/m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0/BUILD
index f0e8122..a8638ca 100644
--- a/common/m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0/BUILD
+++ b/common/m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/doxia/doxia-site-renderer/1.0/BUILD b/common/m2/repository/org/apache/maven/doxia/doxia-site-renderer/1.0/BUILD
index 508baf1..6212825 100644
--- a/common/m2/repository/org/apache/maven/doxia/doxia-site-renderer/1.0/BUILD
+++ b/common/m2/repository/org/apache/maven/doxia/doxia-site-renderer/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/doxia/doxia-sitetools/1.0/BUILD b/common/m2/repository/org/apache/maven/doxia/doxia-sitetools/1.0/BUILD
index 1eac4d1..98da1c1 100644
--- a/common/m2/repository/org/apache/maven/doxia/doxia-sitetools/1.0/BUILD
+++ b/common/m2/repository/org/apache/maven/doxia/doxia-sitetools/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/doxia/doxia/1.0-alpha-10/BUILD b/common/m2/repository/org/apache/maven/doxia/doxia/1.0-alpha-10/BUILD
index 0bd8c9f..03d0860 100644
--- a/common/m2/repository/org/apache/maven/doxia/doxia/1.0-alpha-10/BUILD
+++ b/common/m2/repository/org/apache/maven/doxia/doxia/1.0-alpha-10/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/doxia/doxia/1.0-alpha-7/BUILD b/common/m2/repository/org/apache/maven/doxia/doxia/1.0-alpha-7/BUILD
index ca5a463..af0115f 100644
--- a/common/m2/repository/org/apache/maven/doxia/doxia/1.0-alpha-7/BUILD
+++ b/common/m2/repository/org/apache/maven/doxia/doxia/1.0-alpha-7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/doxia/doxia/1.0/BUILD b/common/m2/repository/org/apache/maven/doxia/doxia/1.0/BUILD
index 9f91be0..d2b91eb 100644
--- a/common/m2/repository/org/apache/maven/doxia/doxia/1.0/BUILD
+++ b/common/m2/repository/org/apache/maven/doxia/doxia/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-aether-provider/3.0/BUILD b/common/m2/repository/org/apache/maven/maven-aether-provider/3.0/BUILD
index 2a45b71..c71c1e2 100644
--- a/common/m2/repository/org/apache/maven/maven-aether-provider/3.0/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-aether-provider/3.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-aether-provider/3.3.9/BUILD b/common/m2/repository/org/apache/maven/maven-aether-provider/3.3.9/BUILD
index a72a94d..0454bda 100644
--- a/common/m2/repository/org/apache/maven/maven-aether-provider/3.3.9/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-aether-provider/3.3.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-ant-tasks/2.1.3/BUILD b/common/m2/repository/org/apache/maven/maven-ant-tasks/2.1.3/BUILD
index 65cac5a..30fcebf 100644
--- a/common/m2/repository/org/apache/maven/maven-ant-tasks/2.1.3/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-ant-tasks/2.1.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-archiver/2.4.1/BUILD b/common/m2/repository/org/apache/maven/maven-archiver/2.4.1/BUILD
index e1d1a89..af24dfb 100644
--- a/common/m2/repository/org/apache/maven/maven-archiver/2.4.1/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-archiver/2.4.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-artifact-manager/2.0.2/BUILD b/common/m2/repository/org/apache/maven/maven-artifact-manager/2.0.2/BUILD
index 5e471b0..adc44cc 100644
--- a/common/m2/repository/org/apache/maven/maven-artifact-manager/2.0.2/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-artifact-manager/2.0.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-artifact-manager/2.0.5/BUILD b/common/m2/repository/org/apache/maven/maven-artifact-manager/2.0.5/BUILD
index 9b12928..454ba45 100644
--- a/common/m2/repository/org/apache/maven/maven-artifact-manager/2.0.5/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-artifact-manager/2.0.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-artifact-manager/2.0.6/BUILD b/common/m2/repository/org/apache/maven/maven-artifact-manager/2.0.6/BUILD
index b78ce15..c8f6753 100644
--- a/common/m2/repository/org/apache/maven/maven-artifact-manager/2.0.6/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-artifact-manager/2.0.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-artifact-manager/2.0.7/BUILD b/common/m2/repository/org/apache/maven/maven-artifact-manager/2.0.7/BUILD
index f1508ba..c2deb56 100644
--- a/common/m2/repository/org/apache/maven/maven-artifact-manager/2.0.7/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-artifact-manager/2.0.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-artifact-manager/2.0.8/BUILD b/common/m2/repository/org/apache/maven/maven-artifact-manager/2.0.8/BUILD
index 7a97041..7c34e54 100644
--- a/common/m2/repository/org/apache/maven/maven-artifact-manager/2.0.8/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-artifact-manager/2.0.8/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-artifact-manager/2.0.9/BUILD b/common/m2/repository/org/apache/maven/maven-artifact-manager/2.0.9/BUILD
index 640a4c1..88155c1 100644
--- a/common/m2/repository/org/apache/maven/maven-artifact-manager/2.0.9/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-artifact-manager/2.0.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-artifact-manager/2.2.0/BUILD b/common/m2/repository/org/apache/maven/maven-artifact-manager/2.2.0/BUILD
index e5a04b7..29e1eb5 100644
--- a/common/m2/repository/org/apache/maven/maven-artifact-manager/2.2.0/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-artifact-manager/2.2.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-artifact-manager/2.2.1/BUILD b/common/m2/repository/org/apache/maven/maven-artifact-manager/2.2.1/BUILD
index 8275755..c6e9e4d 100644
--- a/common/m2/repository/org/apache/maven/maven-artifact-manager/2.2.1/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-artifact-manager/2.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-artifact/2.0.2/BUILD b/common/m2/repository/org/apache/maven/maven-artifact/2.0.2/BUILD
index 39640a0..5bdde4c 100644
--- a/common/m2/repository/org/apache/maven/maven-artifact/2.0.2/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-artifact/2.0.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-artifact/2.0.5/BUILD b/common/m2/repository/org/apache/maven/maven-artifact/2.0.5/BUILD
index 8baec7c..85ce614 100644
--- a/common/m2/repository/org/apache/maven/maven-artifact/2.0.5/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-artifact/2.0.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-artifact/2.0.6/BUILD b/common/m2/repository/org/apache/maven/maven-artifact/2.0.6/BUILD
index dc44fce..727f3c9 100644
--- a/common/m2/repository/org/apache/maven/maven-artifact/2.0.6/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-artifact/2.0.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-artifact/2.0.7/BUILD b/common/m2/repository/org/apache/maven/maven-artifact/2.0.7/BUILD
index c59f181..c0c59de 100644
--- a/common/m2/repository/org/apache/maven/maven-artifact/2.0.7/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-artifact/2.0.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-artifact/2.0.8/BUILD b/common/m2/repository/org/apache/maven/maven-artifact/2.0.8/BUILD
index 11da41e..ccbcc2a 100644
--- a/common/m2/repository/org/apache/maven/maven-artifact/2.0.8/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-artifact/2.0.8/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-artifact/2.0.9/BUILD b/common/m2/repository/org/apache/maven/maven-artifact/2.0.9/BUILD
index 7eaa8a0..1327ab1 100644
--- a/common/m2/repository/org/apache/maven/maven-artifact/2.0.9/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-artifact/2.0.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-artifact/2.2.0/BUILD b/common/m2/repository/org/apache/maven/maven-artifact/2.2.0/BUILD
index 411447b..ae3365a 100644
--- a/common/m2/repository/org/apache/maven/maven-artifact/2.2.0/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-artifact/2.2.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-artifact/2.2.1/BUILD b/common/m2/repository/org/apache/maven/maven-artifact/2.2.1/BUILD
index bb3f34b..b06dfae 100644
--- a/common/m2/repository/org/apache/maven/maven-artifact/2.2.1/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-artifact/2.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-artifact/3.0/BUILD b/common/m2/repository/org/apache/maven/maven-artifact/3.0/BUILD
index dd7a6a8..c12d0b6 100644
--- a/common/m2/repository/org/apache/maven/maven-artifact/3.0/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-artifact/3.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-artifact/3.2.1/BUILD b/common/m2/repository/org/apache/maven/maven-artifact/3.2.1/BUILD
index 508f585..5a32415 100644
--- a/common/m2/repository/org/apache/maven/maven-artifact/3.2.1/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-artifact/3.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-artifact/3.3.9/BUILD b/common/m2/repository/org/apache/maven/maven-artifact/3.3.9/BUILD
index 884a668..bb6a66a 100644
--- a/common/m2/repository/org/apache/maven/maven-artifact/3.3.9/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-artifact/3.3.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-builder-support/3.3.9/BUILD b/common/m2/repository/org/apache/maven/maven-builder-support/3.3.9/BUILD
index d7d8769..480564f 100644
--- a/common/m2/repository/org/apache/maven/maven-builder-support/3.3.9/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-builder-support/3.3.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-core/2.0.7/BUILD b/common/m2/repository/org/apache/maven/maven-core/2.0.7/BUILD
index ab7d50d..b0f7eaf 100644
--- a/common/m2/repository/org/apache/maven/maven-core/2.0.7/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-core/2.0.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-core/2.0.9/BUILD b/common/m2/repository/org/apache/maven/maven-core/2.0.9/BUILD
index b7d57b3..c93bde7 100644
--- a/common/m2/repository/org/apache/maven/maven-core/2.0.9/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-core/2.0.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-core/3.0/BUILD b/common/m2/repository/org/apache/maven/maven-core/3.0/BUILD
index fb5a0b4..049cd38 100644
--- a/common/m2/repository/org/apache/maven/maven-core/3.0/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-core/3.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-error-diagnostics/2.0.7/BUILD b/common/m2/repository/org/apache/maven/maven-error-diagnostics/2.0.7/BUILD
index cfb1549..b117bd5 100644
--- a/common/m2/repository/org/apache/maven/maven-error-diagnostics/2.0.7/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-error-diagnostics/2.0.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-error-diagnostics/2.0.9/BUILD b/common/m2/repository/org/apache/maven/maven-error-diagnostics/2.0.9/BUILD
index 7fadda9..4ad70d0 100644
--- a/common/m2/repository/org/apache/maven/maven-error-diagnostics/2.0.9/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-error-diagnostics/2.0.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-error-diagnostics/2.2.1/BUILD b/common/m2/repository/org/apache/maven/maven-error-diagnostics/2.2.1/BUILD
index 727bc2e..ccce241 100644
--- a/common/m2/repository/org/apache/maven/maven-error-diagnostics/2.2.1/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-error-diagnostics/2.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-model-builder/3.0/BUILD b/common/m2/repository/org/apache/maven/maven-model-builder/3.0/BUILD
index af6de0b..90a7660 100644
--- a/common/m2/repository/org/apache/maven/maven-model-builder/3.0/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-model-builder/3.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-model-builder/3.3.9/BUILD b/common/m2/repository/org/apache/maven/maven-model-builder/3.3.9/BUILD
index b27a2ee..ae8ae18 100644
--- a/common/m2/repository/org/apache/maven/maven-model-builder/3.3.9/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-model-builder/3.3.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-model/2.0.5/BUILD b/common/m2/repository/org/apache/maven/maven-model/2.0.5/BUILD
index f2c2b0d..8c567a9 100644
--- a/common/m2/repository/org/apache/maven/maven-model/2.0.5/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-model/2.0.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-model/2.0.6/BUILD b/common/m2/repository/org/apache/maven/maven-model/2.0.6/BUILD
index 5715b4a..1b2585e 100644
--- a/common/m2/repository/org/apache/maven/maven-model/2.0.6/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-model/2.0.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-model/2.0.7/BUILD b/common/m2/repository/org/apache/maven/maven-model/2.0.7/BUILD
index a38c1fa..809da40 100644
--- a/common/m2/repository/org/apache/maven/maven-model/2.0.7/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-model/2.0.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-model/2.0.8/BUILD b/common/m2/repository/org/apache/maven/maven-model/2.0.8/BUILD
index 874eb2b..6fd8fab 100644
--- a/common/m2/repository/org/apache/maven/maven-model/2.0.8/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-model/2.0.8/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-model/2.0.9/BUILD b/common/m2/repository/org/apache/maven/maven-model/2.0.9/BUILD
index 11c2e30..2a717f3 100644
--- a/common/m2/repository/org/apache/maven/maven-model/2.0.9/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-model/2.0.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-model/2.2.0/BUILD b/common/m2/repository/org/apache/maven/maven-model/2.2.0/BUILD
index 4e18c7d..478a9b6 100644
--- a/common/m2/repository/org/apache/maven/maven-model/2.2.0/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-model/2.2.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-model/2.2.1/BUILD b/common/m2/repository/org/apache/maven/maven-model/2.2.1/BUILD
index f4dff55..62bc6a7 100644
--- a/common/m2/repository/org/apache/maven/maven-model/2.2.1/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-model/2.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-model/3.0/BUILD b/common/m2/repository/org/apache/maven/maven-model/3.0/BUILD
index cbf38da..0fcce32 100644
--- a/common/m2/repository/org/apache/maven/maven-model/3.0/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-model/3.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-model/3.2.1/BUILD b/common/m2/repository/org/apache/maven/maven-model/3.2.1/BUILD
index 583ab45..2d7f027 100644
--- a/common/m2/repository/org/apache/maven/maven-model/3.2.1/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-model/3.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-model/3.3.9/BUILD b/common/m2/repository/org/apache/maven/maven-model/3.3.9/BUILD
index b4bd82a..93eea82 100644
--- a/common/m2/repository/org/apache/maven/maven-model/3.3.9/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-model/3.3.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-monitor/2.0.7/BUILD b/common/m2/repository/org/apache/maven/maven-monitor/2.0.7/BUILD
index 9c6c8e6..bab4e54 100644
--- a/common/m2/repository/org/apache/maven/maven-monitor/2.0.7/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-monitor/2.0.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-monitor/2.0.9/BUILD b/common/m2/repository/org/apache/maven/maven-monitor/2.0.9/BUILD
index a512904..91f63e9 100644
--- a/common/m2/repository/org/apache/maven/maven-monitor/2.0.9/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-monitor/2.0.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-parent/10/BUILD b/common/m2/repository/org/apache/maven/maven-parent/10/BUILD
index aacb2fc..3f634a8 100644
--- a/common/m2/repository/org/apache/maven/maven-parent/10/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-parent/10/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-parent/11/BUILD b/common/m2/repository/org/apache/maven/maven-parent/11/BUILD
index f439e58..37e3c75 100644
--- a/common/m2/repository/org/apache/maven/maven-parent/11/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-parent/11/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-parent/13/BUILD b/common/m2/repository/org/apache/maven/maven-parent/13/BUILD
index 2da6558..cb5cee1 100644
--- a/common/m2/repository/org/apache/maven/maven-parent/13/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-parent/13/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-parent/15/BUILD b/common/m2/repository/org/apache/maven/maven-parent/15/BUILD
index 4bb3cef..2d9230c 100644
--- a/common/m2/repository/org/apache/maven/maven-parent/15/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-parent/15/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-parent/16/BUILD b/common/m2/repository/org/apache/maven/maven-parent/16/BUILD
index a35805d..596434b 100644
--- a/common/m2/repository/org/apache/maven/maven-parent/16/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-parent/16/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-parent/19/BUILD b/common/m2/repository/org/apache/maven/maven-parent/19/BUILD
index 9591e6f..8b4520c 100644
--- a/common/m2/repository/org/apache/maven/maven-parent/19/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-parent/19/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-parent/21/BUILD b/common/m2/repository/org/apache/maven/maven-parent/21/BUILD
index 2bf0971..0d9804a 100644
--- a/common/m2/repository/org/apache/maven/maven-parent/21/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-parent/21/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-parent/22/BUILD b/common/m2/repository/org/apache/maven/maven-parent/22/BUILD
index 8e39fd6..2795943 100644
--- a/common/m2/repository/org/apache/maven/maven-parent/22/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-parent/22/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-parent/23/BUILD b/common/m2/repository/org/apache/maven/maven-parent/23/BUILD
index 3027ab8..a0f386f 100644
--- a/common/m2/repository/org/apache/maven/maven-parent/23/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-parent/23/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-parent/27/BUILD b/common/m2/repository/org/apache/maven/maven-parent/27/BUILD
index 43c6baf..66e701a 100644
--- a/common/m2/repository/org/apache/maven/maven-parent/27/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-parent/27/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-parent/5/BUILD b/common/m2/repository/org/apache/maven/maven-parent/5/BUILD
index f97178e..240ca26 100644
--- a/common/m2/repository/org/apache/maven/maven-parent/5/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-parent/5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-parent/6/BUILD b/common/m2/repository/org/apache/maven/maven-parent/6/BUILD
index e5c0fb0..9d567a8 100644
--- a/common/m2/repository/org/apache/maven/maven-parent/6/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-parent/6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-parent/7/BUILD b/common/m2/repository/org/apache/maven/maven-parent/7/BUILD
index 78c5092..6a1dff0 100644
--- a/common/m2/repository/org/apache/maven/maven-parent/7/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-parent/7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-parent/8/BUILD b/common/m2/repository/org/apache/maven/maven-parent/8/BUILD
index 7400a35..33a3b73 100644
--- a/common/m2/repository/org/apache/maven/maven-parent/8/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-parent/8/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-parent/9/BUILD b/common/m2/repository/org/apache/maven/maven-parent/9/BUILD
index c467993..9e88bf2 100644
--- a/common/m2/repository/org/apache/maven/maven-parent/9/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-parent/9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-plugin-api/2.0.6/BUILD b/common/m2/repository/org/apache/maven/maven-plugin-api/2.0.6/BUILD
index 855791e..20a8db5 100644
--- a/common/m2/repository/org/apache/maven/maven-plugin-api/2.0.6/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-plugin-api/2.0.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-plugin-api/2.0.7/BUILD b/common/m2/repository/org/apache/maven/maven-plugin-api/2.0.7/BUILD
index cc90db2..4f9a90f 100644
--- a/common/m2/repository/org/apache/maven/maven-plugin-api/2.0.7/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-plugin-api/2.0.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-plugin-api/2.0.8/BUILD b/common/m2/repository/org/apache/maven/maven-plugin-api/2.0.8/BUILD
index 7dc9e7a..30fcb5b 100644
--- a/common/m2/repository/org/apache/maven/maven-plugin-api/2.0.8/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-plugin-api/2.0.8/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-plugin-api/2.0.9/BUILD b/common/m2/repository/org/apache/maven/maven-plugin-api/2.0.9/BUILD
index d00c9b8..fc480be 100644
--- a/common/m2/repository/org/apache/maven/maven-plugin-api/2.0.9/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-plugin-api/2.0.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-plugin-api/3.0/BUILD b/common/m2/repository/org/apache/maven/maven-plugin-api/3.0/BUILD
index 6031aa4..229e823 100644
--- a/common/m2/repository/org/apache/maven/maven-plugin-api/3.0/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-plugin-api/3.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-plugin-api/3.2.1/BUILD b/common/m2/repository/org/apache/maven/maven-plugin-api/3.2.1/BUILD
index f77c08d..1a27408 100644
--- a/common/m2/repository/org/apache/maven/maven-plugin-api/3.2.1/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-plugin-api/3.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-plugin-descriptor/2.0.7/BUILD b/common/m2/repository/org/apache/maven/maven-plugin-descriptor/2.0.7/BUILD
index 0bfe41d..37e7c84 100644
--- a/common/m2/repository/org/apache/maven/maven-plugin-descriptor/2.0.7/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-plugin-descriptor/2.0.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-plugin-descriptor/2.0.9/BUILD b/common/m2/repository/org/apache/maven/maven-plugin-descriptor/2.0.9/BUILD
index 8cba0c5..19a542e 100644
--- a/common/m2/repository/org/apache/maven/maven-plugin-descriptor/2.0.9/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-plugin-descriptor/2.0.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.0.7/BUILD b/common/m2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.0.7/BUILD
index 81ffb09..e7dc0b3 100644
--- a/common/m2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.0.7/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.0.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.0.9/BUILD b/common/m2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.0.9/BUILD
index 04f71bf..15fcc6c 100644
--- a/common/m2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.0.9/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.0.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-plugin-registry/2.0.6/BUILD b/common/m2/repository/org/apache/maven/maven-plugin-registry/2.0.6/BUILD
index aabbc89..a0825f0 100644
--- a/common/m2/repository/org/apache/maven/maven-plugin-registry/2.0.6/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-plugin-registry/2.0.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-plugin-registry/2.0.7/BUILD b/common/m2/repository/org/apache/maven/maven-plugin-registry/2.0.7/BUILD
index 560d81b..fb24526 100644
--- a/common/m2/repository/org/apache/maven/maven-plugin-registry/2.0.7/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-plugin-registry/2.0.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-plugin-registry/2.0.8/BUILD b/common/m2/repository/org/apache/maven/maven-plugin-registry/2.0.8/BUILD
index 251a68d..d6065c9 100644
--- a/common/m2/repository/org/apache/maven/maven-plugin-registry/2.0.8/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-plugin-registry/2.0.8/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-plugin-registry/2.0.9/BUILD b/common/m2/repository/org/apache/maven/maven-plugin-registry/2.0.9/BUILD
index 33ca2cb..5da9db9 100644
--- a/common/m2/repository/org/apache/maven/maven-plugin-registry/2.0.9/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-plugin-registry/2.0.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-plugin-registry/2.2.0/BUILD b/common/m2/repository/org/apache/maven/maven-plugin-registry/2.2.0/BUILD
index 2ac142f..8d647b3 100644
--- a/common/m2/repository/org/apache/maven/maven-plugin-registry/2.2.0/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-plugin-registry/2.2.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-plugin-registry/2.2.1/BUILD b/common/m2/repository/org/apache/maven/maven-plugin-registry/2.2.1/BUILD
index 72f712d..fe01d44 100644
--- a/common/m2/repository/org/apache/maven/maven-plugin-registry/2.2.1/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-plugin-registry/2.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-profile/2.0.5/BUILD b/common/m2/repository/org/apache/maven/maven-profile/2.0.5/BUILD
index 762e23e..4d0260f 100644
--- a/common/m2/repository/org/apache/maven/maven-profile/2.0.5/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-profile/2.0.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-profile/2.0.6/BUILD b/common/m2/repository/org/apache/maven/maven-profile/2.0.6/BUILD
index 37d4f3a..ee7971d 100644
--- a/common/m2/repository/org/apache/maven/maven-profile/2.0.6/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-profile/2.0.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-profile/2.0.7/BUILD b/common/m2/repository/org/apache/maven/maven-profile/2.0.7/BUILD
index 075876a..bcacdb7 100644
--- a/common/m2/repository/org/apache/maven/maven-profile/2.0.7/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-profile/2.0.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-profile/2.0.8/BUILD b/common/m2/repository/org/apache/maven/maven-profile/2.0.8/BUILD
index a1f5207..cd0239f 100644
--- a/common/m2/repository/org/apache/maven/maven-profile/2.0.8/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-profile/2.0.8/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-profile/2.0.9/BUILD b/common/m2/repository/org/apache/maven/maven-profile/2.0.9/BUILD
index fbe0e5d..d6e699a 100644
--- a/common/m2/repository/org/apache/maven/maven-profile/2.0.9/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-profile/2.0.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-profile/2.2.0/BUILD b/common/m2/repository/org/apache/maven/maven-profile/2.2.0/BUILD
index 8ef0c35..3f9a66a 100644
--- a/common/m2/repository/org/apache/maven/maven-profile/2.2.0/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-profile/2.2.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-profile/2.2.1/BUILD b/common/m2/repository/org/apache/maven/maven-profile/2.2.1/BUILD
index 231cdbd..2e22943 100644
--- a/common/m2/repository/org/apache/maven/maven-profile/2.2.1/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-profile/2.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-project/2.0.5/BUILD b/common/m2/repository/org/apache/maven/maven-project/2.0.5/BUILD
index 19b4951..0ae754b 100644
--- a/common/m2/repository/org/apache/maven/maven-project/2.0.5/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-project/2.0.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-project/2.0.6/BUILD b/common/m2/repository/org/apache/maven/maven-project/2.0.6/BUILD
index d48f93c..4ec5a0a 100644
--- a/common/m2/repository/org/apache/maven/maven-project/2.0.6/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-project/2.0.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-project/2.0.7/BUILD b/common/m2/repository/org/apache/maven/maven-project/2.0.7/BUILD
index 4d04437..c91adf4 100644
--- a/common/m2/repository/org/apache/maven/maven-project/2.0.7/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-project/2.0.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-project/2.0.8/BUILD b/common/m2/repository/org/apache/maven/maven-project/2.0.8/BUILD
index 57bc739..65c8d54 100644
--- a/common/m2/repository/org/apache/maven/maven-project/2.0.8/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-project/2.0.8/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-project/2.0.9/BUILD b/common/m2/repository/org/apache/maven/maven-project/2.0.9/BUILD
index 19c086d..f465c95 100644
--- a/common/m2/repository/org/apache/maven/maven-project/2.0.9/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-project/2.0.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-project/2.2.0/BUILD b/common/m2/repository/org/apache/maven/maven-project/2.2.0/BUILD
index 9018944..006c2f0 100644
--- a/common/m2/repository/org/apache/maven/maven-project/2.2.0/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-project/2.2.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-project/2.2.1/BUILD b/common/m2/repository/org/apache/maven/maven-project/2.2.1/BUILD
index e896e09..0c42b97 100644
--- a/common/m2/repository/org/apache/maven/maven-project/2.2.1/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-project/2.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-repository-metadata/2.0.2/BUILD b/common/m2/repository/org/apache/maven/maven-repository-metadata/2.0.2/BUILD
index 3bbc9cb..5e99cd8 100644
--- a/common/m2/repository/org/apache/maven/maven-repository-metadata/2.0.2/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-repository-metadata/2.0.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-repository-metadata/2.0.5/BUILD b/common/m2/repository/org/apache/maven/maven-repository-metadata/2.0.5/BUILD
index 25b2057..80a47dd 100644
--- a/common/m2/repository/org/apache/maven/maven-repository-metadata/2.0.5/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-repository-metadata/2.0.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-repository-metadata/2.0.6/BUILD b/common/m2/repository/org/apache/maven/maven-repository-metadata/2.0.6/BUILD
index 795aace..24e2acf 100644
--- a/common/m2/repository/org/apache/maven/maven-repository-metadata/2.0.6/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-repository-metadata/2.0.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-repository-metadata/2.0.7/BUILD b/common/m2/repository/org/apache/maven/maven-repository-metadata/2.0.7/BUILD
index 6744386..958a73a 100644
--- a/common/m2/repository/org/apache/maven/maven-repository-metadata/2.0.7/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-repository-metadata/2.0.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-repository-metadata/2.0.8/BUILD b/common/m2/repository/org/apache/maven/maven-repository-metadata/2.0.8/BUILD
index 020a0e8..8f92b2d 100644
--- a/common/m2/repository/org/apache/maven/maven-repository-metadata/2.0.8/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-repository-metadata/2.0.8/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-repository-metadata/2.0.9/BUILD b/common/m2/repository/org/apache/maven/maven-repository-metadata/2.0.9/BUILD
index d1be9dc..5d06a56 100644
--- a/common/m2/repository/org/apache/maven/maven-repository-metadata/2.0.9/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-repository-metadata/2.0.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-repository-metadata/2.2.0/BUILD b/common/m2/repository/org/apache/maven/maven-repository-metadata/2.2.0/BUILD
index 2319e65..e227923 100644
--- a/common/m2/repository/org/apache/maven/maven-repository-metadata/2.2.0/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-repository-metadata/2.2.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-repository-metadata/2.2.1/BUILD b/common/m2/repository/org/apache/maven/maven-repository-metadata/2.2.1/BUILD
index 8ba739b..ba8fdc1 100644
--- a/common/m2/repository/org/apache/maven/maven-repository-metadata/2.2.1/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-repository-metadata/2.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-repository-metadata/3.0/BUILD b/common/m2/repository/org/apache/maven/maven-repository-metadata/3.0/BUILD
index 0787043..8b2b75b 100644
--- a/common/m2/repository/org/apache/maven/maven-repository-metadata/3.0/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-repository-metadata/3.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-repository-metadata/3.3.9/BUILD b/common/m2/repository/org/apache/maven/maven-repository-metadata/3.3.9/BUILD
index 8feefd6..64996bf 100644
--- a/common/m2/repository/org/apache/maven/maven-repository-metadata/3.3.9/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-repository-metadata/3.3.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-settings-builder/3.0/BUILD b/common/m2/repository/org/apache/maven/maven-settings-builder/3.0/BUILD
index 18dcabc..51620bd 100644
--- a/common/m2/repository/org/apache/maven/maven-settings-builder/3.0/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-settings-builder/3.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-settings/2.0.5/BUILD b/common/m2/repository/org/apache/maven/maven-settings/2.0.5/BUILD
index 2c89dd5..19442bb 100644
--- a/common/m2/repository/org/apache/maven/maven-settings/2.0.5/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-settings/2.0.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-settings/2.0.6/BUILD b/common/m2/repository/org/apache/maven/maven-settings/2.0.6/BUILD
index 4a4e435..4c3d991 100644
--- a/common/m2/repository/org/apache/maven/maven-settings/2.0.6/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-settings/2.0.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-settings/2.0.7/BUILD b/common/m2/repository/org/apache/maven/maven-settings/2.0.7/BUILD
index 56745bf..f6b333b 100644
--- a/common/m2/repository/org/apache/maven/maven-settings/2.0.7/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-settings/2.0.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-settings/2.0.8/BUILD b/common/m2/repository/org/apache/maven/maven-settings/2.0.8/BUILD
index 831133e..0e82e14 100644
--- a/common/m2/repository/org/apache/maven/maven-settings/2.0.8/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-settings/2.0.8/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-settings/2.0.9/BUILD b/common/m2/repository/org/apache/maven/maven-settings/2.0.9/BUILD
index aa68e6e..b1ebe76 100644
--- a/common/m2/repository/org/apache/maven/maven-settings/2.0.9/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-settings/2.0.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-settings/2.2.0/BUILD b/common/m2/repository/org/apache/maven/maven-settings/2.2.0/BUILD
index 15ac8a5..a9f5c82 100644
--- a/common/m2/repository/org/apache/maven/maven-settings/2.2.0/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-settings/2.2.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven-settings/2.2.1/BUILD b/common/m2/repository/org/apache/maven/maven-settings/2.2.1/BUILD
index d78c0d7..146bce6 100644
--- a/common/m2/repository/org/apache/maven/maven-settings/2.2.1/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-settings/2.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/maven-settings/3.0/BUILD b/common/m2/repository/org/apache/maven/maven-settings/3.0/BUILD
index 925ff73..6ff9d52 100644
--- a/common/m2/repository/org/apache/maven/maven-settings/3.0/BUILD
+++ b/common/m2/repository/org/apache/maven/maven-settings/3.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven/2.0.2/BUILD b/common/m2/repository/org/apache/maven/maven/2.0.2/BUILD
index a28946f..937e86e 100644
--- a/common/m2/repository/org/apache/maven/maven/2.0.2/BUILD
+++ b/common/m2/repository/org/apache/maven/maven/2.0.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven/2.0.5/BUILD b/common/m2/repository/org/apache/maven/maven/2.0.5/BUILD
index 40ad701..efa19f3 100644
--- a/common/m2/repository/org/apache/maven/maven/2.0.5/BUILD
+++ b/common/m2/repository/org/apache/maven/maven/2.0.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven/2.0.6/BUILD b/common/m2/repository/org/apache/maven/maven/2.0.6/BUILD
index cac5a9a..0dcb617 100644
--- a/common/m2/repository/org/apache/maven/maven/2.0.6/BUILD
+++ b/common/m2/repository/org/apache/maven/maven/2.0.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven/2.0.7/BUILD b/common/m2/repository/org/apache/maven/maven/2.0.7/BUILD
index 7e26b7f..761b86d 100644
--- a/common/m2/repository/org/apache/maven/maven/2.0.7/BUILD
+++ b/common/m2/repository/org/apache/maven/maven/2.0.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven/2.0.8/BUILD b/common/m2/repository/org/apache/maven/maven/2.0.8/BUILD
index 3dd8a85..da210d7 100644
--- a/common/m2/repository/org/apache/maven/maven/2.0.8/BUILD
+++ b/common/m2/repository/org/apache/maven/maven/2.0.8/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven/2.0.9/BUILD b/common/m2/repository/org/apache/maven/maven/2.0.9/BUILD
index 7a6d707..b9dad57 100644
--- a/common/m2/repository/org/apache/maven/maven/2.0.9/BUILD
+++ b/common/m2/repository/org/apache/maven/maven/2.0.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven/2.2.0/BUILD b/common/m2/repository/org/apache/maven/maven/2.2.0/BUILD
index 360c426..f89460b 100644
--- a/common/m2/repository/org/apache/maven/maven/2.2.0/BUILD
+++ b/common/m2/repository/org/apache/maven/maven/2.2.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven/2.2.1/BUILD b/common/m2/repository/org/apache/maven/maven/2.2.1/BUILD
index a94f08e..6a6ed09 100644
--- a/common/m2/repository/org/apache/maven/maven/2.2.1/BUILD
+++ b/common/m2/repository/org/apache/maven/maven/2.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven/3.0/BUILD b/common/m2/repository/org/apache/maven/maven/3.0/BUILD
index 665be4d..1d9c821 100644
--- a/common/m2/repository/org/apache/maven/maven/3.0/BUILD
+++ b/common/m2/repository/org/apache/maven/maven/3.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven/3.2.1/BUILD b/common/m2/repository/org/apache/maven/maven/3.2.1/BUILD
index 96a9ce1..1516757 100644
--- a/common/m2/repository/org/apache/maven/maven/3.2.1/BUILD
+++ b/common/m2/repository/org/apache/maven/maven/3.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/maven/3.3.9/BUILD b/common/m2/repository/org/apache/maven/maven/3.3.9/BUILD
index a8fd1fc..9a6d662 100644
--- a/common/m2/repository/org/apache/maven/maven/3.3.9/BUILD
+++ b/common/m2/repository/org/apache/maven/maven/3.3.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/plugins/maven-antrun-plugin/1.3/BUILD b/common/m2/repository/org/apache/maven/plugins/maven-antrun-plugin/1.3/BUILD
index c0e91ef..70e108b 100644
--- a/common/m2/repository/org/apache/maven/plugins/maven-antrun-plugin/1.3/BUILD
+++ b/common/m2/repository/org/apache/maven/plugins/maven-antrun-plugin/1.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/plugins/maven-assembly-plugin/2.2-beta-5/BUILD b/common/m2/repository/org/apache/maven/plugins/maven-assembly-plugin/2.2-beta-5/BUILD
index 012182d..ea05943 100644
--- a/common/m2/repository/org/apache/maven/plugins/maven-assembly-plugin/2.2-beta-5/BUILD
+++ b/common/m2/repository/org/apache/maven/plugins/maven-assembly-plugin/2.2-beta-5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/plugins/maven-clean-plugin/2.5/BUILD b/common/m2/repository/org/apache/maven/plugins/maven-clean-plugin/2.5/BUILD
index 85e72a5..b4fe68a 100644
--- a/common/m2/repository/org/apache/maven/plugins/maven-clean-plugin/2.5/BUILD
+++ b/common/m2/repository/org/apache/maven/plugins/maven-clean-plugin/2.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/plugins/maven-dependency-plugin/2.8/BUILD b/common/m2/repository/org/apache/maven/plugins/maven-dependency-plugin/2.8/BUILD
index a38c2da..402ca5e 100644
--- a/common/m2/repository/org/apache/maven/plugins/maven-dependency-plugin/2.8/BUILD
+++ b/common/m2/repository/org/apache/maven/plugins/maven-dependency-plugin/2.8/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/plugins/maven-deploy-plugin/2.7/BUILD b/common/m2/repository/org/apache/maven/plugins/maven-deploy-plugin/2.7/BUILD
index d14c24c..2859fa8 100644
--- a/common/m2/repository/org/apache/maven/plugins/maven-deploy-plugin/2.7/BUILD
+++ b/common/m2/repository/org/apache/maven/plugins/maven-deploy-plugin/2.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/plugins/maven-install-plugin/2.4/BUILD b/common/m2/repository/org/apache/maven/plugins/maven-install-plugin/2.4/BUILD
index e18fded..4b2de7f 100644
--- a/common/m2/repository/org/apache/maven/plugins/maven-install-plugin/2.4/BUILD
+++ b/common/m2/repository/org/apache/maven/plugins/maven-install-plugin/2.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/plugins/maven-plugins/12/BUILD b/common/m2/repository/org/apache/maven/plugins/maven-plugins/12/BUILD
index 612e62c..230a18f 100644
--- a/common/m2/repository/org/apache/maven/plugins/maven-plugins/12/BUILD
+++ b/common/m2/repository/org/apache/maven/plugins/maven-plugins/12/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/plugins/maven-plugins/16/BUILD b/common/m2/repository/org/apache/maven/plugins/maven-plugins/16/BUILD
index b2a45fd..9043e54 100644
--- a/common/m2/repository/org/apache/maven/plugins/maven-plugins/16/BUILD
+++ b/common/m2/repository/org/apache/maven/plugins/maven-plugins/16/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/plugins/maven-plugins/22/BUILD b/common/m2/repository/org/apache/maven/plugins/maven-plugins/22/BUILD
index 5a6849b..285232a 100644
--- a/common/m2/repository/org/apache/maven/plugins/maven-plugins/22/BUILD
+++ b/common/m2/repository/org/apache/maven/plugins/maven-plugins/22/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/plugins/maven-plugins/23/BUILD b/common/m2/repository/org/apache/maven/plugins/maven-plugins/23/BUILD
index eec3d80..c7a8af8 100644
--- a/common/m2/repository/org/apache/maven/plugins/maven-plugins/23/BUILD
+++ b/common/m2/repository/org/apache/maven/plugins/maven-plugins/23/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/plugins/maven-plugins/24/BUILD b/common/m2/repository/org/apache/maven/plugins/maven-plugins/24/BUILD
index 49bb2ee..8b94fed 100644
--- a/common/m2/repository/org/apache/maven/plugins/maven-plugins/24/BUILD
+++ b/common/m2/repository/org/apache/maven/plugins/maven-plugins/24/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/plugins/maven-site-plugin/3.3/BUILD b/common/m2/repository/org/apache/maven/plugins/maven-site-plugin/3.3/BUILD
index 87ff20b..442497a 100644
--- a/common/m2/repository/org/apache/maven/plugins/maven-site-plugin/3.3/BUILD
+++ b/common/m2/repository/org/apache/maven/plugins/maven-site-plugin/3.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.6/BUILD b/common/m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.6/BUILD
index 4abcffe..4a443f5 100644
--- a/common/m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.6/BUILD
+++ b/common/m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.7/BUILD b/common/m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.7/BUILD
index 78593e2..1574c98 100644
--- a/common/m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.7/BUILD
+++ b/common/m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.9/BUILD b/common/m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.9/BUILD
index d0246a7..b1ee9bd 100644
--- a/common/m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.9/BUILD
+++ b/common/m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/reporting/maven-reporting-api/3.0/BUILD b/common/m2/repository/org/apache/maven/reporting/maven-reporting-api/3.0/BUILD
index 63a2f96..9e21a57 100644
--- a/common/m2/repository/org/apache/maven/reporting/maven-reporting-api/3.0/BUILD
+++ b/common/m2/repository/org/apache/maven/reporting/maven-reporting-api/3.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/reporting/maven-reporting-impl/2.0.5/BUILD b/common/m2/repository/org/apache/maven/reporting/maven-reporting-impl/2.0.5/BUILD
index b20f57c..c9103d6 100644
--- a/common/m2/repository/org/apache/maven/reporting/maven-reporting-impl/2.0.5/BUILD
+++ b/common/m2/repository/org/apache/maven/reporting/maven-reporting-impl/2.0.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/reporting/maven-reporting/2.0.6/BUILD b/common/m2/repository/org/apache/maven/reporting/maven-reporting/2.0.6/BUILD
index 601f6bb..1dae170 100644
--- a/common/m2/repository/org/apache/maven/reporting/maven-reporting/2.0.6/BUILD
+++ b/common/m2/repository/org/apache/maven/reporting/maven-reporting/2.0.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/reporting/maven-reporting/2.0.7/BUILD b/common/m2/repository/org/apache/maven/reporting/maven-reporting/2.0.7/BUILD
index ed2242c..9bb0aa0 100644
--- a/common/m2/repository/org/apache/maven/reporting/maven-reporting/2.0.7/BUILD
+++ b/common/m2/repository/org/apache/maven/reporting/maven-reporting/2.0.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/reporting/maven-reporting/2.0.9/BUILD b/common/m2/repository/org/apache/maven/reporting/maven-reporting/2.0.9/BUILD
index 4461fc1..f7f1ec8 100644
--- a/common/m2/repository/org/apache/maven/reporting/maven-reporting/2.0.9/BUILD
+++ b/common/m2/repository/org/apache/maven/reporting/maven-reporting/2.0.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/shared/file-management/1.2.1/BUILD b/common/m2/repository/org/apache/maven/shared/file-management/1.2.1/BUILD
index cf15a91..28fadf4 100644
--- a/common/m2/repository/org/apache/maven/shared/file-management/1.2.1/BUILD
+++ b/common/m2/repository/org/apache/maven/shared/file-management/1.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/shared/maven-common-artifact-filters/1.4/BUILD b/common/m2/repository/org/apache/maven/shared/maven-common-artifact-filters/1.4/BUILD
index 49cd1e8..d852492 100644
--- a/common/m2/repository/org/apache/maven/shared/maven-common-artifact-filters/1.4/BUILD
+++ b/common/m2/repository/org/apache/maven/shared/maven-common-artifact-filters/1.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/shared/maven-dependency-analyzer/1.4/BUILD b/common/m2/repository/org/apache/maven/shared/maven-dependency-analyzer/1.4/BUILD
index dc0a7c3..ce90ded 100644
--- a/common/m2/repository/org/apache/maven/shared/maven-dependency-analyzer/1.4/BUILD
+++ b/common/m2/repository/org/apache/maven/shared/maven-dependency-analyzer/1.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/shared/maven-dependency-tree/1.2/BUILD b/common/m2/repository/org/apache/maven/shared/maven-dependency-tree/1.2/BUILD
index 52a06e8..8c22e4f 100644
--- a/common/m2/repository/org/apache/maven/shared/maven-dependency-tree/1.2/BUILD
+++ b/common/m2/repository/org/apache/maven/shared/maven-dependency-tree/1.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/shared/maven-dependency-tree/2.1/BUILD b/common/m2/repository/org/apache/maven/shared/maven-dependency-tree/2.1/BUILD
index db56476..52a6aa5 100644
--- a/common/m2/repository/org/apache/maven/shared/maven-dependency-tree/2.1/BUILD
+++ b/common/m2/repository/org/apache/maven/shared/maven-dependency-tree/2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/shared/maven-doxia-tools/1.0.2/BUILD b/common/m2/repository/org/apache/maven/shared/maven-doxia-tools/1.0.2/BUILD
index 9367818..a51a8eb 100644
--- a/common/m2/repository/org/apache/maven/shared/maven-doxia-tools/1.0.2/BUILD
+++ b/common/m2/repository/org/apache/maven/shared/maven-doxia-tools/1.0.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/shared/maven-invoker/2.0.11/BUILD b/common/m2/repository/org/apache/maven/shared/maven-invoker/2.0.11/BUILD
index 9a32ade..84dc49d 100644
--- a/common/m2/repository/org/apache/maven/shared/maven-invoker/2.0.11/BUILD
+++ b/common/m2/repository/org/apache/maven/shared/maven-invoker/2.0.11/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/shared/maven-shared-components/10/BUILD b/common/m2/repository/org/apache/maven/shared/maven-shared-components/10/BUILD
index 7b9bcbb..f95556c 100644
--- a/common/m2/repository/org/apache/maven/shared/maven-shared-components/10/BUILD
+++ b/common/m2/repository/org/apache/maven/shared/maven-shared-components/10/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/shared/maven-shared-components/11/BUILD b/common/m2/repository/org/apache/maven/shared/maven-shared-components/11/BUILD
index fff9a37..8c68e05 100644
--- a/common/m2/repository/org/apache/maven/shared/maven-shared-components/11/BUILD
+++ b/common/m2/repository/org/apache/maven/shared/maven-shared-components/11/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/shared/maven-shared-components/12/BUILD b/common/m2/repository/org/apache/maven/shared/maven-shared-components/12/BUILD
index 2c111eb..ffdeedb 100644
--- a/common/m2/repository/org/apache/maven/shared/maven-shared-components/12/BUILD
+++ b/common/m2/repository/org/apache/maven/shared/maven-shared-components/12/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/shared/maven-shared-components/15/BUILD b/common/m2/repository/org/apache/maven/shared/maven-shared-components/15/BUILD
index 0fa6115..9ef89e5 100644
--- a/common/m2/repository/org/apache/maven/shared/maven-shared-components/15/BUILD
+++ b/common/m2/repository/org/apache/maven/shared/maven-shared-components/15/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/shared/maven-shared-components/17/BUILD b/common/m2/repository/org/apache/maven/shared/maven-shared-components/17/BUILD
index fb4f61b..4c145a8 100644
--- a/common/m2/repository/org/apache/maven/shared/maven-shared-components/17/BUILD
+++ b/common/m2/repository/org/apache/maven/shared/maven-shared-components/17/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/shared/maven-shared-components/19/BUILD b/common/m2/repository/org/apache/maven/shared/maven-shared-components/19/BUILD
index c614d1c..029b3f0 100644
--- a/common/m2/repository/org/apache/maven/shared/maven-shared-components/19/BUILD
+++ b/common/m2/repository/org/apache/maven/shared/maven-shared-components/19/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/shared/maven-shared-components/8/BUILD b/common/m2/repository/org/apache/maven/shared/maven-shared-components/8/BUILD
index c0d3ddc..4af3c21 100644
--- a/common/m2/repository/org/apache/maven/shared/maven-shared-components/8/BUILD
+++ b/common/m2/repository/org/apache/maven/shared/maven-shared-components/8/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/shared/maven-shared-components/9/BUILD b/common/m2/repository/org/apache/maven/shared/maven-shared-components/9/BUILD
index 61158fa..dfc92a4 100644
--- a/common/m2/repository/org/apache/maven/shared/maven-shared-components/9/BUILD
+++ b/common/m2/repository/org/apache/maven/shared/maven-shared-components/9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/shared/maven-shared-io/1.1/BUILD b/common/m2/repository/org/apache/maven/shared/maven-shared-io/1.1/BUILD
index ceb6069..cf70c9a 100644
--- a/common/m2/repository/org/apache/maven/shared/maven-shared-io/1.1/BUILD
+++ b/common/m2/repository/org/apache/maven/shared/maven-shared-io/1.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/wagon/wagon-file/1.0-beta-6/BUILD b/common/m2/repository/org/apache/maven/wagon/wagon-file/1.0-beta-6/BUILD
index 1eb98aa..fc68d54 100644
--- a/common/m2/repository/org/apache/maven/wagon/wagon-file/1.0-beta-6/BUILD
+++ b/common/m2/repository/org/apache/maven/wagon/wagon-file/1.0-beta-6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-6/BUILD b/common/m2/repository/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-6/BUILD
index 0649ac5..6b00fb7 100644
--- a/common/m2/repository/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-6/BUILD
+++ b/common/m2/repository/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/wagon/wagon-http-shared/1.0-beta-6/BUILD b/common/m2/repository/org/apache/maven/wagon/wagon-http-shared/1.0-beta-6/BUILD
index a12b42d..2c7d9d9 100644
--- a/common/m2/repository/org/apache/maven/wagon/wagon-http-shared/1.0-beta-6/BUILD
+++ b/common/m2/repository/org/apache/maven/wagon/wagon-http-shared/1.0-beta-6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/BUILD b/common/m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/BUILD
index decd127..acb3f47 100644
--- a/common/m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/BUILD
+++ b/common/m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/BUILD b/common/m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/BUILD
index b79e335..a8f1247 100644
--- a/common/m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/BUILD
+++ b/common/m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/maven/wagon/wagon-providers/1.0-beta-6/BUILD b/common/m2/repository/org/apache/maven/wagon/wagon-providers/1.0-beta-6/BUILD
index 2dc866d..523eb93 100644
--- a/common/m2/repository/org/apache/maven/wagon/wagon-providers/1.0-beta-6/BUILD
+++ b/common/m2/repository/org/apache/maven/wagon/wagon-providers/1.0-beta-6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/wagon/wagon/1.0-alpha-6/BUILD b/common/m2/repository/org/apache/maven/wagon/wagon/1.0-alpha-6/BUILD
index 78dca04..e83b204 100644
--- a/common/m2/repository/org/apache/maven/wagon/wagon/1.0-alpha-6/BUILD
+++ b/common/m2/repository/org/apache/maven/wagon/wagon/1.0-alpha-6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/maven/wagon/wagon/1.0-beta-6/BUILD b/common/m2/repository/org/apache/maven/wagon/wagon/1.0-beta-6/BUILD
index 63fb1a4..f94eea2 100644
--- a/common/m2/repository/org/apache/maven/wagon/wagon/1.0-beta-6/BUILD
+++ b/common/m2/repository/org/apache/maven/wagon/wagon/1.0-beta-6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/velocity/velocity/1.5/BUILD b/common/m2/repository/org/apache/velocity/velocity/1.5/BUILD
index 92c8042..d3328cf 100644
--- a/common/m2/repository/org/apache/velocity/velocity/1.5/BUILD
+++ b/common/m2/repository/org/apache/velocity/velocity/1.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/velocity/velocity/1.7/BUILD b/common/m2/repository/org/apache/velocity/velocity/1.7/BUILD
index d36b5a5..a27adf2 100644
--- a/common/m2/repository/org/apache/velocity/velocity/1.7/BUILD
+++ b/common/m2/repository/org/apache/velocity/velocity/1.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/apache/xbean/xbean-reflect/3.4/BUILD b/common/m2/repository/org/apache/xbean/xbean-reflect/3.4/BUILD
index 2594ee5..3f30c1a 100644
--- a/common/m2/repository/org/apache/xbean/xbean-reflect/3.4/BUILD
+++ b/common/m2/repository/org/apache/xbean/xbean-reflect/3.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/apache/xbean/xbean/3.4/BUILD b/common/m2/repository/org/apache/xbean/xbean/3.4/BUILD
index 7235621..b68598b 100644
--- a/common/m2/repository/org/apache/xbean/xbean/3.4/BUILD
+++ b/common/m2/repository/org/apache/xbean/xbean/3.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/assertj/assertj-core/2.0.0/BUILD b/common/m2/repository/org/assertj/assertj-core/2.0.0/BUILD
index 188aa8e..5f22ce0 100644
--- a/common/m2/repository/org/assertj/assertj-core/2.0.0/BUILD
+++ b/common/m2/repository/org/assertj/assertj-core/2.0.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/assertj/assertj-parent-pom/1.3.5/BUILD b/common/m2/repository/org/assertj/assertj-parent-pom/1.3.5/BUILD
index 59f500e..1be313e 100644
--- a/common/m2/repository/org/assertj/assertj-parent-pom/1.3.5/BUILD
+++ b/common/m2/repository/org/assertj/assertj-parent-pom/1.3.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/beanshell/beanshell/2.0b4/BUILD b/common/m2/repository/org/beanshell/beanshell/2.0b4/BUILD
index 24e562a..bccbea9 100644
--- a/common/m2/repository/org/beanshell/beanshell/2.0b4/BUILD
+++ b/common/m2/repository/org/beanshell/beanshell/2.0b4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/beanshell/bsh/2.0b4/BUILD b/common/m2/repository/org/beanshell/bsh/2.0b4/BUILD
index 29c5f21..f9d362a 100644
--- a/common/m2/repository/org/beanshell/bsh/2.0b4/BUILD
+++ b/common/m2/repository/org/beanshell/bsh/2.0b4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/bouncycastle/bcpkix-jdk15on/1.48/BUILD b/common/m2/repository/org/bouncycastle/bcpkix-jdk15on/1.48/BUILD
index a58f6e0..e00eeda 100644
--- a/common/m2/repository/org/bouncycastle/bcpkix-jdk15on/1.48/BUILD
+++ b/common/m2/repository/org/bouncycastle/bcpkix-jdk15on/1.48/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/bouncycastle/bcprov-jdk15on/1.48/BUILD b/common/m2/repository/org/bouncycastle/bcprov-jdk15on/1.48/BUILD
index b9e352a..a7c8b13 100644
--- a/common/m2/repository/org/bouncycastle/bcprov-jdk15on/1.48/BUILD
+++ b/common/m2/repository/org/bouncycastle/bcprov-jdk15on/1.48/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/bouncycastle/bcprov-jdk15on/1.50/BUILD b/common/m2/repository/org/bouncycastle/bcprov-jdk15on/1.50/BUILD
index 441d386..3cf5f94 100644
--- a/common/m2/repository/org/bouncycastle/bcprov-jdk15on/1.50/BUILD
+++ b/common/m2/repository/org/bouncycastle/bcprov-jdk15on/1.50/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/bouncycastle/bcprov-jdk16/1.46/BUILD b/common/m2/repository/org/bouncycastle/bcprov-jdk16/1.46/BUILD
index 3f3a95a..50b6cb0 100644
--- a/common/m2/repository/org/bouncycastle/bcprov-jdk16/1.46/BUILD
+++ b/common/m2/repository/org/bouncycastle/bcprov-jdk16/1.46/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ccil/cowan/tagsoup/tagsoup/1.2.1/BUILD b/common/m2/repository/org/ccil/cowan/tagsoup/tagsoup/1.2.1/BUILD
index e3b8c6d..1abafea 100644
--- a/common/m2/repository/org/ccil/cowan/tagsoup/tagsoup/1.2.1/BUILD
+++ b/common/m2/repository/org/ccil/cowan/tagsoup/tagsoup/1.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ccil/cowan/tagsoup/tagsoup/1.2/BUILD b/common/m2/repository/org/ccil/cowan/tagsoup/tagsoup/1.2/BUILD
index 93c3b2d..9429d55 100644
--- a/common/m2/repository/org/ccil/cowan/tagsoup/tagsoup/1.2/BUILD
+++ b/common/m2/repository/org/ccil/cowan/tagsoup/tagsoup/1.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/codehaus-parent/3/BUILD b/common/m2/repository/org/codehaus/codehaus-parent/3/BUILD
index b2c4bd6..f1217d5 100644
--- a/common/m2/repository/org/codehaus/codehaus-parent/3/BUILD
+++ b/common/m2/repository/org/codehaus/codehaus-parent/3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/codehaus-parent/4/BUILD b/common/m2/repository/org/codehaus/codehaus-parent/4/BUILD
index a778d93..5dfd147 100644
--- a/common/m2/repository/org/codehaus/codehaus-parent/4/BUILD
+++ b/common/m2/repository/org/codehaus/codehaus-parent/4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/gmaven/feature/gmaven-feature-api/1.5/BUILD b/common/m2/repository/org/codehaus/gmaven/feature/gmaven-feature-api/1.5/BUILD
index 040d79c..315bd44 100644
--- a/common/m2/repository/org/codehaus/gmaven/feature/gmaven-feature-api/1.5/BUILD
+++ b/common/m2/repository/org/codehaus/gmaven/feature/gmaven-feature-api/1.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/gmaven/feature/gmaven-feature-support/1.5/BUILD b/common/m2/repository/org/codehaus/gmaven/feature/gmaven-feature-support/1.5/BUILD
index e286198..4334660 100644
--- a/common/m2/repository/org/codehaus/gmaven/feature/gmaven-feature-support/1.5/BUILD
+++ b/common/m2/repository/org/codehaus/gmaven/feature/gmaven-feature-support/1.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/gmaven/feature/gmaven-feature/1.5/BUILD b/common/m2/repository/org/codehaus/gmaven/feature/gmaven-feature/1.5/BUILD
index b66bd83..88c0ddc 100644
--- a/common/m2/repository/org/codehaus/gmaven/feature/gmaven-feature/1.5/BUILD
+++ b/common/m2/repository/org/codehaus/gmaven/feature/gmaven-feature/1.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/gmaven/gmaven/1.5/BUILD b/common/m2/repository/org/codehaus/gmaven/gmaven/1.5/BUILD
index 7baacb2..c2d8e9c 100644
--- a/common/m2/repository/org/codehaus/gmaven/gmaven/1.5/BUILD
+++ b/common/m2/repository/org/codehaus/gmaven/gmaven/1.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/gmaven/runtime/gmaven-runtime-2.0/1.5/BUILD b/common/m2/repository/org/codehaus/gmaven/runtime/gmaven-runtime-2.0/1.5/BUILD
index 6fbdb8f..d65a4df 100644
--- a/common/m2/repository/org/codehaus/gmaven/runtime/gmaven-runtime-2.0/1.5/BUILD
+++ b/common/m2/repository/org/codehaus/gmaven/runtime/gmaven-runtime-2.0/1.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/gmaven/runtime/gmaven-runtime-api/1.5/BUILD b/common/m2/repository/org/codehaus/gmaven/runtime/gmaven-runtime-api/1.5/BUILD
index 300ac35..1cf28b4 100644
--- a/common/m2/repository/org/codehaus/gmaven/runtime/gmaven-runtime-api/1.5/BUILD
+++ b/common/m2/repository/org/codehaus/gmaven/runtime/gmaven-runtime-api/1.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/gmaven/runtime/gmaven-runtime-support/1.5/BUILD b/common/m2/repository/org/codehaus/gmaven/runtime/gmaven-runtime-support/1.5/BUILD
index 02b4db5..499c7ce 100644
--- a/common/m2/repository/org/codehaus/gmaven/runtime/gmaven-runtime-support/1.5/BUILD
+++ b/common/m2/repository/org/codehaus/gmaven/runtime/gmaven-runtime-support/1.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/gmaven/runtime/gmaven-runtime/1.5/BUILD b/common/m2/repository/org/codehaus/gmaven/runtime/gmaven-runtime/1.5/BUILD
index 171d1f5..ed99b44 100644
--- a/common/m2/repository/org/codehaus/gmaven/runtime/gmaven-runtime/1.5/BUILD
+++ b/common/m2/repository/org/codehaus/gmaven/runtime/gmaven-runtime/1.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/groovy/groovy-all/2.2.1/BUILD b/common/m2/repository/org/codehaus/groovy/groovy-all/2.2.1/BUILD
index e9ed7ae..3728934 100644
--- a/common/m2/repository/org/codehaus/groovy/groovy-all/2.2.1/BUILD
+++ b/common/m2/repository/org/codehaus/groovy/groovy-all/2.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/groovy/groovy-all/2.3.6/BUILD b/common/m2/repository/org/codehaus/groovy/groovy-all/2.3.6/BUILD
index 1afb524..49300bc 100644
--- a/common/m2/repository/org/codehaus/groovy/groovy-all/2.3.6/BUILD
+++ b/common/m2/repository/org/codehaus/groovy/groovy-all/2.3.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/groovy/groovy-all/2.4.7/BUILD b/common/m2/repository/org/codehaus/groovy/groovy-all/2.4.7/BUILD
index 962788a..a9c8a9f 100644
--- a/common/m2/repository/org/codehaus/groovy/groovy-all/2.4.7/BUILD
+++ b/common/m2/repository/org/codehaus/groovy/groovy-all/2.4.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/groovy/modules/http-builder/http-builder/0.7.2/BUILD b/common/m2/repository/org/codehaus/groovy/modules/http-builder/http-builder/0.7.2/BUILD
index 7a3feb5..41db569 100644
--- a/common/m2/repository/org/codehaus/groovy/modules/http-builder/http-builder/0.7.2/BUILD
+++ b/common/m2/repository/org/codehaus/groovy/modules/http-builder/http-builder/0.7.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/mojo/animal-sniffer-annotations/1.10/BUILD b/common/m2/repository/org/codehaus/mojo/animal-sniffer-annotations/1.10/BUILD
index cb94bd3..54c3a7e 100644
--- a/common/m2/repository/org/codehaus/mojo/animal-sniffer-annotations/1.10/BUILD
+++ b/common/m2/repository/org/codehaus/mojo/animal-sniffer-annotations/1.10/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/mojo/animal-sniffer-annotations/1.14/BUILD b/common/m2/repository/org/codehaus/mojo/animal-sniffer-annotations/1.14/BUILD
index 25b316a..822635f 100644
--- a/common/m2/repository/org/codehaus/mojo/animal-sniffer-annotations/1.14/BUILD
+++ b/common/m2/repository/org/codehaus/mojo/animal-sniffer-annotations/1.14/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/mojo/animal-sniffer-parent/1.10/BUILD b/common/m2/repository/org/codehaus/mojo/animal-sniffer-parent/1.10/BUILD
index 7d358e1..04a256c 100644
--- a/common/m2/repository/org/codehaus/mojo/animal-sniffer-parent/1.10/BUILD
+++ b/common/m2/repository/org/codehaus/mojo/animal-sniffer-parent/1.10/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/mojo/animal-sniffer-parent/1.14/BUILD b/common/m2/repository/org/codehaus/mojo/animal-sniffer-parent/1.14/BUILD
index ac45cad..04b86b4 100644
--- a/common/m2/repository/org/codehaus/mojo/animal-sniffer-parent/1.14/BUILD
+++ b/common/m2/repository/org/codehaus/mojo/animal-sniffer-parent/1.14/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/mojo/mojo-parent/32/BUILD b/common/m2/repository/org/codehaus/mojo/mojo-parent/32/BUILD
index 2dac375..4ecf13c 100644
--- a/common/m2/repository/org/codehaus/mojo/mojo-parent/32/BUILD
+++ b/common/m2/repository/org/codehaus/mojo/mojo-parent/32/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/mojo/mojo-parent/34/BUILD b/common/m2/repository/org/codehaus/mojo/mojo-parent/34/BUILD
index d8b88c3..953466b 100644
--- a/common/m2/repository/org/codehaus/mojo/mojo-parent/34/BUILD
+++ b/common/m2/repository/org/codehaus/mojo/mojo-parent/34/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-archiver/1.0/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-archiver/1.0/BUILD
index 936e451..ebb038f 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-archiver/1.0/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-archiver/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-archiver/2.2/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-archiver/2.2/BUILD
index 5c2d64e..adb0191 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-archiver/2.2/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-archiver/2.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-archiver/2.3/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-archiver/2.3/BUILD
index b32588e..12b31e3 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-archiver/2.3/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-archiver/2.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/BUILD
index f9fe22e..5401723 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/BUILD
index b64ed93..b1fc847 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-classworlds/2.2.2/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-classworlds/2.2.2/BUILD
index 5ea2a66..0094a2d 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-classworlds/2.2.2/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-classworlds/2.2.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-classworlds/2.2.3/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-classworlds/2.2.3/BUILD
index 9dfca54..7f07aca 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-classworlds/2.2.3/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-classworlds/2.2.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-classworlds/2.4/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-classworlds/2.4/BUILD
index f1f7e00..b315577 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-classworlds/2.4/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-classworlds/2.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-component-annotations/1.5.4/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-component-annotations/1.5.4/BUILD
index ce70fbb..3129a62 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-component-annotations/1.5.4/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-component-annotations/1.5.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-component-annotations/1.5.5/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-component-annotations/1.5.5/BUILD
index 7d86d7e..eaf8550 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-component-annotations/1.5.5/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-component-annotations/1.5.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-component-annotations/1.6/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-component-annotations/1.6/BUILD
index 11705bd..05e1276 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-component-annotations/1.6/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-component-annotations/1.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.12/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.12/BUILD
index 48edecc..be21302 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.12/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.12/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.14/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.14/BUILD
index 6d72987..c169e2e 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.14/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.14/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.15/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.15/BUILD
index 5198a19..afa5331 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.15/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.15/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.17/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.17/BUILD
index 4f8b308..f0fbba5 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.17/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.17/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.18/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.18/BUILD
index d325eef..24637ec 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.18/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.18/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.19/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.19/BUILD
index 953e196..0194f1a 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.19/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.19/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.20/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.20/BUILD
index 20724dc..7328957 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.20/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-components/1.1.20/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-components/1.2/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-components/1.2/BUILD
index 061fd4a..fe06e11 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-components/1.2/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-components/1.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-components/1.3.1/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-components/1.3.1/BUILD
index e899619..a993428 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-components/1.3.1/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-components/1.3.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-components/1.3/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-components/1.3/BUILD
index 9a5bcd2..377c2d3 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-components/1.3/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-components/1.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-20/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-20/BUILD
index edbe37f..79cf338 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-20/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-20/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/BUILD
index fca1f44..0ad25a8 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/BUILD
index 399af60..7931244 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/BUILD
index 7f31afc..f8b578e 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-container-default/1.5.5/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-container-default/1.5.5/BUILD
index 414cf1e..46a7b5e 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-container-default/1.5.5/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-container-default/1.5.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-containers/1.0-alpha-20/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-containers/1.0-alpha-20/BUILD
index 844eeb6..8c96a3d 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-containers/1.0-alpha-20/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-containers/1.0-alpha-20/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-containers/1.0-alpha-30/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-containers/1.0-alpha-30/BUILD
index 2971756..49b419d 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-containers/1.0-alpha-30/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-containers/1.0-alpha-30/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-containers/1.0.3/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-containers/1.0.3/BUILD
index f54baf4..3a7508d 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-containers/1.0.3/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-containers/1.0.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-containers/1.5.4/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-containers/1.5.4/BUILD
index 2aa01cb..05f4b98 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-containers/1.5.4/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-containers/1.5.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-containers/1.5.5/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-containers/1.5.5/BUILD
index 8dda5ec..4e91bbc 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-containers/1.5.5/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-containers/1.5.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-containers/1.6/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-containers/1.6/BUILD
index 81608f7..eeade17 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-containers/1.6/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-containers/1.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-i18n/1.0-beta-7/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-i18n/1.0-beta-7/BUILD
index 90c89a3..dc54d1c 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-i18n/1.0-beta-7/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-i18n/1.0-beta-7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/BUILD
index 25a1b97..27e9bff 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-interpolation/1.11/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-interpolation/1.11/BUILD
index b745bbd..a74bd90 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-interpolation/1.11/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-interpolation/1.11/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-interpolation/1.13/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-interpolation/1.13/BUILD
index 7a73210..953fed5 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-interpolation/1.13/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-interpolation/1.13/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-interpolation/1.14/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-interpolation/1.14/BUILD
index 55419da..756ac96 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-interpolation/1.14/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-interpolation/1.14/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-interpolation/1.21/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-interpolation/1.21/BUILD
index e8b7efa..ba4f508 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-interpolation/1.21/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-interpolation/1.21/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-io/1.0/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-io/1.0/BUILD
index 83289c2..3278c72 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-io/1.0/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-io/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-io/2.0.4/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-io/2.0.4/BUILD
index c8fedf2..49551e3 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-io/2.0.4/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-io/2.0.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-io/2.0.6/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-io/2.0.6/BUILD
index 49cd642..4feef43 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-io/2.0.6/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-io/2.0.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.0.4/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.0.4/BUILD
index 44a37dc..54c54b5 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.0.4/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.0.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.1/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.1/BUILD
index 0f24510..282bf7f 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.1/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.3/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.3/BUILD
index cea4110..fccb487 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.3/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.4.1/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.4.1/BUILD
index 4f4492e..2066173 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.4.1/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.4.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.4.2/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.4.2/BUILD
index f0702f1..e18c198 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.4.2/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.4.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.4.5/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.4.5/BUILD
index 7a2eeac..fbe1a25 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.4.5/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.4.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.4.6/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.4.6/BUILD
index ec8713c..2466045 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.4.6/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.4.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.5.1/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.5.1/BUILD
index 80aef69..d9e303e 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.5.1/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.5.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.5.15/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.5.15/BUILD
index 4231865..fd5b694 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.5.15/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.5.15/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.5.5/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.5.5/BUILD
index 9c058a1..eb78e2e 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.5.5/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.5.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.5.6/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.5.6/BUILD
index 74ae816..96fbcd7 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.5.6/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.5.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.5.7/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.5.7/BUILD
index 457b2d3..3416b29 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.5.7/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.5.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.5.8/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.5.8/BUILD
index 3d66bfb..c86038a 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-utils/1.5.8/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-utils/1.5.8/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-utils/2.0.4/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-utils/2.0.4/BUILD
index 06b2030..6adedbc 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-utils/2.0.4/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-utils/2.0.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-utils/2.0.5/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-utils/2.0.5/BUILD
index 45d95b1..15df260 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-utils/2.0.5/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-utils/2.0.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-utils/2.1/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-utils/2.1/BUILD
index 341ccb5..4d8f2f2 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-utils/2.1/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-utils/2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0.10/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0.10/BUILD
index 06366b2..60cc248 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0.10/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0.10/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0.17/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0.17/BUILD
index ded4de2..14ed8a8 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0.17/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0.17/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0.22/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0.22/BUILD
index 78d9e06..d255a92 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0.22/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0.22/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0.7/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0.7/BUILD
index 5f481f5..1378dd3 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0.7/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0.8/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0.8/BUILD
index 0c16978..31c1701 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0.8/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0.8/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0.9/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0.9/BUILD
index 9209e46..04e20c0 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0.9/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0/BUILD
index 7ceba58..b01c2f2 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-utils/3.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus-velocity/1.1.7/BUILD b/common/m2/repository/org/codehaus/plexus/plexus-velocity/1.1.7/BUILD
index abf0628..dea12f2 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus-velocity/1.1.7/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus-velocity/1.1.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus/1.0.10/BUILD b/common/m2/repository/org/codehaus/plexus/plexus/1.0.10/BUILD
index adc1461..11237ba 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus/1.0.10/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus/1.0.10/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus/1.0.11/BUILD b/common/m2/repository/org/codehaus/plexus/plexus/1.0.11/BUILD
index 38348f1..4dec22b 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus/1.0.11/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus/1.0.11/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus/1.0.12/BUILD b/common/m2/repository/org/codehaus/plexus/plexus/1.0.12/BUILD
index 06804cd..1057125 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus/1.0.12/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus/1.0.12/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus/1.0.4/BUILD b/common/m2/repository/org/codehaus/plexus/plexus/1.0.4/BUILD
index b12d491..0f02c9b 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus/1.0.4/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus/1.0.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus/1.0.8/BUILD b/common/m2/repository/org/codehaus/plexus/plexus/1.0.8/BUILD
index 77725c1..380be60 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus/1.0.8/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus/1.0.8/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus/1.0.9/BUILD b/common/m2/repository/org/codehaus/plexus/plexus/1.0.9/BUILD
index 0a1c82d..25d54e1 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus/1.0.9/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus/1.0.9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus/2.0.2/BUILD b/common/m2/repository/org/codehaus/plexus/plexus/2.0.2/BUILD
index 55d74b5..65bc0aa 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus/2.0.2/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus/2.0.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus/2.0.3/BUILD b/common/m2/repository/org/codehaus/plexus/plexus/2.0.3/BUILD
index 762d2a2..582e08e 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus/2.0.3/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus/2.0.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus/2.0.5/BUILD b/common/m2/repository/org/codehaus/plexus/plexus/2.0.5/BUILD
index df3e4c5..d6a63c1 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus/2.0.5/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus/2.0.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus/2.0.6/BUILD b/common/m2/repository/org/codehaus/plexus/plexus/2.0.6/BUILD
index 5cad2ba..7b6d19a 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus/2.0.6/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus/2.0.6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus/2.0.7/BUILD b/common/m2/repository/org/codehaus/plexus/plexus/2.0.7/BUILD
index 49b8ac1..d876093 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus/2.0.7/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus/2.0.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus/3.0.1/BUILD b/common/m2/repository/org/codehaus/plexus/plexus/3.0.1/BUILD
index 7103f14..405e524 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus/3.0.1/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus/3.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus/3.1/BUILD b/common/m2/repository/org/codehaus/plexus/plexus/3.1/BUILD
index 3c40fd7..96d75e7 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus/3.1/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus/3.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus/3.2/BUILD b/common/m2/repository/org/codehaus/plexus/plexus/3.2/BUILD
index 54b770b..e055aa1 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus/3.2/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus/3.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus/3.3.1/BUILD b/common/m2/repository/org/codehaus/plexus/plexus/3.3.1/BUILD
index ef9488d..ae23d48 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus/3.3.1/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus/3.3.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus/3.3.2/BUILD b/common/m2/repository/org/codehaus/plexus/plexus/3.3.2/BUILD
index 9ce612c..7ff0474 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus/3.3.2/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus/3.3.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/codehaus/plexus/plexus/3.3/BUILD b/common/m2/repository/org/codehaus/plexus/plexus/3.3/BUILD
index f77bf65..36e5091 100644
--- a/common/m2/repository/org/codehaus/plexus/plexus/3.3/BUILD
+++ b/common/m2/repository/org/codehaus/plexus/plexus/3.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/easymock/easymock-parent/3.1/BUILD b/common/m2/repository/org/easymock/easymock-parent/3.1/BUILD
index b734cdf..45e3bea 100644
--- a/common/m2/repository/org/easymock/easymock-parent/3.1/BUILD
+++ b/common/m2/repository/org/easymock/easymock-parent/3.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/easymock/easymock-parent/3.3/BUILD b/common/m2/repository/org/easymock/easymock-parent/3.3/BUILD
index 77f597a..b1c63f3 100644
--- a/common/m2/repository/org/easymock/easymock-parent/3.3/BUILD
+++ b/common/m2/repository/org/easymock/easymock-parent/3.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/easymock/easymock/2.4/BUILD b/common/m2/repository/org/easymock/easymock/2.4/BUILD
index c7ed5c0..5387c4d 100644
--- a/common/m2/repository/org/easymock/easymock/2.4/BUILD
+++ b/common/m2/repository/org/easymock/easymock/2.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/easymock/easymock/3.1/BUILD b/common/m2/repository/org/easymock/easymock/3.1/BUILD
index 9ff9154..2a0f94e 100644
--- a/common/m2/repository/org/easymock/easymock/3.1/BUILD
+++ b/common/m2/repository/org/easymock/easymock/3.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/easymock/easymock/3.3/BUILD b/common/m2/repository/org/easymock/easymock/3.3/BUILD
index b1e1aa6..a134cfc 100644
--- a/common/m2/repository/org/easymock/easymock/3.3/BUILD
+++ b/common/m2/repository/org/easymock/easymock/3.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/aether/aether-api/0.9.0.M3/BUILD b/common/m2/repository/org/eclipse/aether/aether-api/0.9.0.M3/BUILD
index d95fed6..eb107a0 100644
--- a/common/m2/repository/org/eclipse/aether/aether-api/0.9.0.M3/BUILD
+++ b/common/m2/repository/org/eclipse/aether/aether-api/0.9.0.M3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/eclipse/aether/aether-api/1.0.2.v20150114/BUILD b/common/m2/repository/org/eclipse/aether/aether-api/1.0.2.v20150114/BUILD
index 86b0f10..01ec256 100644
--- a/common/m2/repository/org/eclipse/aether/aether-api/1.0.2.v20150114/BUILD
+++ b/common/m2/repository/org/eclipse/aether/aether-api/1.0.2.v20150114/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/aether/aether-connector-basic/1.0.2.v20150114/BUILD b/common/m2/repository/org/eclipse/aether/aether-connector-basic/1.0.2.v20150114/BUILD
index 932ba86..fe2071e 100644
--- a/common/m2/repository/org/eclipse/aether/aether-connector-basic/1.0.2.v20150114/BUILD
+++ b/common/m2/repository/org/eclipse/aether/aether-connector-basic/1.0.2.v20150114/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/aether/aether-impl/1.0.2.v20150114/BUILD b/common/m2/repository/org/eclipse/aether/aether-impl/1.0.2.v20150114/BUILD
index a53f17f..acb0513 100644
--- a/common/m2/repository/org/eclipse/aether/aether-impl/1.0.2.v20150114/BUILD
+++ b/common/m2/repository/org/eclipse/aether/aether-impl/1.0.2.v20150114/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/aether/aether-spi/1.0.2.v20150114/BUILD b/common/m2/repository/org/eclipse/aether/aether-spi/1.0.2.v20150114/BUILD
index fe0ea6b..f4ab77f 100644
--- a/common/m2/repository/org/eclipse/aether/aether-spi/1.0.2.v20150114/BUILD
+++ b/common/m2/repository/org/eclipse/aether/aether-spi/1.0.2.v20150114/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/aether/aether-transport-file/1.0.2.v20150114/BUILD b/common/m2/repository/org/eclipse/aether/aether-transport-file/1.0.2.v20150114/BUILD
index 2871b9a..1004b48 100644
--- a/common/m2/repository/org/eclipse/aether/aether-transport-file/1.0.2.v20150114/BUILD
+++ b/common/m2/repository/org/eclipse/aether/aether-transport-file/1.0.2.v20150114/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/aether/aether-transport-http/1.0.2.v20150114/BUILD b/common/m2/repository/org/eclipse/aether/aether-transport-http/1.0.2.v20150114/BUILD
index 2963fe5..32585eb 100644
--- a/common/m2/repository/org/eclipse/aether/aether-transport-http/1.0.2.v20150114/BUILD
+++ b/common/m2/repository/org/eclipse/aether/aether-transport-http/1.0.2.v20150114/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/aether/aether-util/0.9.0.M2/BUILD b/common/m2/repository/org/eclipse/aether/aether-util/0.9.0.M2/BUILD
index 9a1acd6..9a1320f 100644
--- a/common/m2/repository/org/eclipse/aether/aether-util/0.9.0.M2/BUILD
+++ b/common/m2/repository/org/eclipse/aether/aether-util/0.9.0.M2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/aether/aether-util/0.9.0.M3/BUILD b/common/m2/repository/org/eclipse/aether/aether-util/0.9.0.M3/BUILD
index 76fcc34..ea9e9c5 100644
--- a/common/m2/repository/org/eclipse/aether/aether-util/0.9.0.M3/BUILD
+++ b/common/m2/repository/org/eclipse/aether/aether-util/0.9.0.M3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/aether/aether-util/1.0.2.v20150114/BUILD b/common/m2/repository/org/eclipse/aether/aether-util/1.0.2.v20150114/BUILD
index 96c802d..139af6c 100644
--- a/common/m2/repository/org/eclipse/aether/aether-util/1.0.2.v20150114/BUILD
+++ b/common/m2/repository/org/eclipse/aether/aether-util/1.0.2.v20150114/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/aether/aether/0.9.0.M2/BUILD b/common/m2/repository/org/eclipse/aether/aether/0.9.0.M2/BUILD
index 8ded509..7dcdec1 100644
--- a/common/m2/repository/org/eclipse/aether/aether/0.9.0.M2/BUILD
+++ b/common/m2/repository/org/eclipse/aether/aether/0.9.0.M2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/eclipse/aether/aether/0.9.0.M3/BUILD b/common/m2/repository/org/eclipse/aether/aether/0.9.0.M3/BUILD
index d702f13..ffcca9e 100644
--- a/common/m2/repository/org/eclipse/aether/aether/0.9.0.M3/BUILD
+++ b/common/m2/repository/org/eclipse/aether/aether/0.9.0.M3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/eclipse/aether/aether/1.0.2.v20150114/BUILD b/common/m2/repository/org/eclipse/aether/aether/1.0.2.v20150114/BUILD
index fc78e18..a5e567d 100644
--- a/common/m2/repository/org/eclipse/aether/aether/1.0.2.v20150114/BUILD
+++ b/common/m2/repository/org/eclipse/aether/aether/1.0.2.v20150114/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/eclipse/jdt/core/compiler/ecj/4.2.2/BUILD b/common/m2/repository/org/eclipse/jdt/core/compiler/ecj/4.2.2/BUILD
index 8449fa0..9944346 100644
--- a/common/m2/repository/org/eclipse/jdt/core/compiler/ecj/4.2.2/BUILD
+++ b/common/m2/repository/org/eclipse/jdt/core/compiler/ecj/4.2.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/jdt/core/compiler/ecj/4.4.2/BUILD b/common/m2/repository/org/eclipse/jdt/core/compiler/ecj/4.4.2/BUILD
index a4365ef..ccfa714 100644
--- a/common/m2/repository/org/eclipse/jdt/core/compiler/ecj/4.4.2/BUILD
+++ b/common/m2/repository/org/eclipse/jdt/core/compiler/ecj/4.4.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/jdt/core/compiler/ecj/4.4/BUILD b/common/m2/repository/org/eclipse/jdt/core/compiler/ecj/4.4/BUILD
index 9ea774d..d688064 100644
--- a/common/m2/repository/org/eclipse/jdt/core/compiler/ecj/4.4/BUILD
+++ b/common/m2/repository/org/eclipse/jdt/core/compiler/ecj/4.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/jdt/core/compiler/ecj/4.5.1/BUILD b/common/m2/repository/org/eclipse/jdt/core/compiler/ecj/4.5.1/BUILD
index 29d4b98..dc563df 100644
--- a/common/m2/repository/org/eclipse/jdt/core/compiler/ecj/4.5.1/BUILD
+++ b/common/m2/repository/org/eclipse/jdt/core/compiler/ecj/4.5.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/jdt/core/compiler/ecj/4.6.1/BUILD b/common/m2/repository/org/eclipse/jdt/core/compiler/ecj/4.6.1/BUILD
index 49b8c70..2ee059b 100644
--- a/common/m2/repository/org/eclipse/jdt/core/compiler/ecj/4.6.1/BUILD
+++ b/common/m2/repository/org/eclipse/jdt/core/compiler/ecj/4.6.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/jetty/jetty-http/8.1.14.v20131031/BUILD b/common/m2/repository/org/eclipse/jetty/jetty-http/8.1.14.v20131031/BUILD
index 16f1cf6..91cd24c 100644
--- a/common/m2/repository/org/eclipse/jetty/jetty-http/8.1.14.v20131031/BUILD
+++ b/common/m2/repository/org/eclipse/jetty/jetty-http/8.1.14.v20131031/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/jetty/jetty-io/8.1.14.v20131031/BUILD b/common/m2/repository/org/eclipse/jetty/jetty-io/8.1.14.v20131031/BUILD
index 5f4bf9a..7e1a35d 100644
--- a/common/m2/repository/org/eclipse/jetty/jetty-io/8.1.14.v20131031/BUILD
+++ b/common/m2/repository/org/eclipse/jetty/jetty-io/8.1.14.v20131031/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/jetty/jetty-parent/20/BUILD b/common/m2/repository/org/eclipse/jetty/jetty-parent/20/BUILD
index bef5780..f2d5c68 100644
--- a/common/m2/repository/org/eclipse/jetty/jetty-parent/20/BUILD
+++ b/common/m2/repository/org/eclipse/jetty/jetty-parent/20/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/eclipse/jetty/jetty-project/8.1.14.v20131031/BUILD b/common/m2/repository/org/eclipse/jetty/jetty-project/8.1.14.v20131031/BUILD
index cf78b96..cdb58d0 100644
--- a/common/m2/repository/org/eclipse/jetty/jetty-project/8.1.14.v20131031/BUILD
+++ b/common/m2/repository/org/eclipse/jetty/jetty-project/8.1.14.v20131031/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/eclipse/jetty/jetty-util/8.1.14.v20131031/BUILD b/common/m2/repository/org/eclipse/jetty/jetty-util/8.1.14.v20131031/BUILD
index 6b577e2..5fd7d98 100644
--- a/common/m2/repository/org/eclipse/jetty/jetty-util/8.1.14.v20131031/BUILD
+++ b/common/m2/repository/org/eclipse/jetty/jetty-util/8.1.14.v20131031/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/jetty/jetty-websocket/8.1.14.v20131031/BUILD b/common/m2/repository/org/eclipse/jetty/jetty-websocket/8.1.14.v20131031/BUILD
index ca6475d..be6b895 100644
--- a/common/m2/repository/org/eclipse/jetty/jetty-websocket/8.1.14.v20131031/BUILD
+++ b/common/m2/repository/org/eclipse/jetty/jetty-websocket/8.1.14.v20131031/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/sisu/org.eclipse.sisu.inject/0.0.0.M5/BUILD b/common/m2/repository/org/eclipse/sisu/org.eclipse.sisu.inject/0.0.0.M5/BUILD
index 0b365de..dd7d7f5 100644
--- a/common/m2/repository/org/eclipse/sisu/org.eclipse.sisu.inject/0.0.0.M5/BUILD
+++ b/common/m2/repository/org/eclipse/sisu/org.eclipse.sisu.inject/0.0.0.M5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/sisu/org.eclipse.sisu.plexus/0.0.0.M5/BUILD b/common/m2/repository/org/eclipse/sisu/org.eclipse.sisu.plexus/0.0.0.M5/BUILD
index bbc5454..3f406a8 100644
--- a/common/m2/repository/org/eclipse/sisu/org.eclipse.sisu.plexus/0.0.0.M5/BUILD
+++ b/common/m2/repository/org/eclipse/sisu/org.eclipse.sisu.plexus/0.0.0.M5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/sisu/sisu-inject/0.0.0.M5/BUILD b/common/m2/repository/org/eclipse/sisu/sisu-inject/0.0.0.M5/BUILD
index 0833593..cfda7eb 100644
--- a/common/m2/repository/org/eclipse/sisu/sisu-inject/0.0.0.M5/BUILD
+++ b/common/m2/repository/org/eclipse/sisu/sisu-inject/0.0.0.M5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/eclipse/sisu/sisu-plexus/0.0.0.M5/BUILD b/common/m2/repository/org/eclipse/sisu/sisu-plexus/0.0.0.M5/BUILD
index 34b5dec..416fe0b 100644
--- a/common/m2/repository/org/eclipse/sisu/sisu-plexus/0.0.0.M5/BUILD
+++ b/common/m2/repository/org/eclipse/sisu/sisu-plexus/0.0.0.M5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/eclipse/tycho/extras/tycho-extras/0.18.1/BUILD b/common/m2/repository/org/eclipse/tycho/extras/tycho-extras/0.18.1/BUILD
index fb1265f..697c1c6 100644
--- a/common/m2/repository/org/eclipse/tycho/extras/tycho-extras/0.18.1/BUILD
+++ b/common/m2/repository/org/eclipse/tycho/extras/tycho-extras/0.18.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/eclipse/tycho/extras/tycho-p2-extras-plugin/0.18.1/BUILD b/common/m2/repository/org/eclipse/tycho/extras/tycho-p2-extras-plugin/0.18.1/BUILD
index d54bb55..68062fa 100644
--- a/common/m2/repository/org/eclipse/tycho/extras/tycho-p2-extras-plugin/0.18.1/BUILD
+++ b/common/m2/repository/org/eclipse/tycho/extras/tycho-p2-extras-plugin/0.18.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/tycho/org.eclipse.osgi/3.9.0.v20130529-1710/BUILD b/common/m2/repository/org/eclipse/tycho/org.eclipse.osgi/3.9.0.v20130529-1710/BUILD
index 1128621..61b8d9b 100644
--- a/common/m2/repository/org/eclipse/tycho/org.eclipse.osgi/3.9.0.v20130529-1710/BUILD
+++ b/common/m2/repository/org/eclipse/tycho/org.eclipse.osgi/3.9.0.v20130529-1710/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/tycho/org.eclipse.tycho.core.shared/0.18.1/BUILD b/common/m2/repository/org/eclipse/tycho/org.eclipse.tycho.core.shared/0.18.1/BUILD
index 3ee80c6..76c42d3 100644
--- a/common/m2/repository/org/eclipse/tycho/org.eclipse.tycho.core.shared/0.18.1/BUILD
+++ b/common/m2/repository/org/eclipse/tycho/org.eclipse.tycho.core.shared/0.18.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/tycho/org.eclipse.tycho.embedder.shared/0.18.1/BUILD b/common/m2/repository/org/eclipse/tycho/org.eclipse.tycho.embedder.shared/0.18.1/BUILD
index 412f6c5..7af89b4 100644
--- a/common/m2/repository/org/eclipse/tycho/org.eclipse.tycho.embedder.shared/0.18.1/BUILD
+++ b/common/m2/repository/org/eclipse/tycho/org.eclipse.tycho.embedder.shared/0.18.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/tycho/org.eclipse.tycho.p2.resolver.shared/0.18.1/BUILD b/common/m2/repository/org/eclipse/tycho/org.eclipse.tycho.p2.resolver.shared/0.18.1/BUILD
index 0d2ba69..1af1d0c 100644
--- a/common/m2/repository/org/eclipse/tycho/org.eclipse.tycho.p2.resolver.shared/0.18.1/BUILD
+++ b/common/m2/repository/org/eclipse/tycho/org.eclipse.tycho.p2.resolver.shared/0.18.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/tycho/org.eclipse.tycho.p2.tools.shared/0.18.1/BUILD b/common/m2/repository/org/eclipse/tycho/org.eclipse.tycho.p2.tools.shared/0.18.1/BUILD
index e7aaae6..486404b 100644
--- a/common/m2/repository/org/eclipse/tycho/org.eclipse.tycho.p2.tools.shared/0.18.1/BUILD
+++ b/common/m2/repository/org/eclipse/tycho/org.eclipse.tycho.p2.tools.shared/0.18.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/tycho/sisu-equinox-api/0.18.1/BUILD b/common/m2/repository/org/eclipse/tycho/sisu-equinox-api/0.18.1/BUILD
index 96b872d..13d8f6d 100644
--- a/common/m2/repository/org/eclipse/tycho/sisu-equinox-api/0.18.1/BUILD
+++ b/common/m2/repository/org/eclipse/tycho/sisu-equinox-api/0.18.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/tycho/sisu-equinox-embedder/0.18.1/BUILD b/common/m2/repository/org/eclipse/tycho/sisu-equinox-embedder/0.18.1/BUILD
index 41eb26c..2cc930a 100644
--- a/common/m2/repository/org/eclipse/tycho/sisu-equinox-embedder/0.18.1/BUILD
+++ b/common/m2/repository/org/eclipse/tycho/sisu-equinox-embedder/0.18.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/tycho/sisu-equinox-launching/0.18.1/BUILD b/common/m2/repository/org/eclipse/tycho/sisu-equinox-launching/0.18.1/BUILD
index 73c674c..9bfe971 100644
--- a/common/m2/repository/org/eclipse/tycho/sisu-equinox-launching/0.18.1/BUILD
+++ b/common/m2/repository/org/eclipse/tycho/sisu-equinox-launching/0.18.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/tycho/sisu-equinox/0.18.1/BUILD b/common/m2/repository/org/eclipse/tycho/sisu-equinox/0.18.1/BUILD
index d8f8965..ad72fc3 100644
--- a/common/m2/repository/org/eclipse/tycho/sisu-equinox/0.18.1/BUILD
+++ b/common/m2/repository/org/eclipse/tycho/sisu-equinox/0.18.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/eclipse/tycho/tycho-bundles/0.18.1/BUILD b/common/m2/repository/org/eclipse/tycho/tycho-bundles/0.18.1/BUILD
index 79a3940..908ec87 100644
--- a/common/m2/repository/org/eclipse/tycho/tycho-bundles/0.18.1/BUILD
+++ b/common/m2/repository/org/eclipse/tycho/tycho-bundles/0.18.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/eclipse/tycho/tycho-core/0.18.1/BUILD b/common/m2/repository/org/eclipse/tycho/tycho-core/0.18.1/BUILD
index 6adf352..b74da76 100644
--- a/common/m2/repository/org/eclipse/tycho/tycho-core/0.18.1/BUILD
+++ b/common/m2/repository/org/eclipse/tycho/tycho-core/0.18.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/tycho/tycho-embedder-api/0.18.1/BUILD b/common/m2/repository/org/eclipse/tycho/tycho-embedder-api/0.18.1/BUILD
index 4a86f75..b443df5 100644
--- a/common/m2/repository/org/eclipse/tycho/tycho-embedder-api/0.18.1/BUILD
+++ b/common/m2/repository/org/eclipse/tycho/tycho-embedder-api/0.18.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/tycho/tycho-metadata-model/0.18.1/BUILD b/common/m2/repository/org/eclipse/tycho/tycho-metadata-model/0.18.1/BUILD
index 0cb1e4c..2190431 100644
--- a/common/m2/repository/org/eclipse/tycho/tycho-metadata-model/0.18.1/BUILD
+++ b/common/m2/repository/org/eclipse/tycho/tycho-metadata-model/0.18.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/tycho/tycho-p2-facade/0.18.1/BUILD b/common/m2/repository/org/eclipse/tycho/tycho-p2-facade/0.18.1/BUILD
index 5374a38..d05de25 100644
--- a/common/m2/repository/org/eclipse/tycho/tycho-p2-facade/0.18.1/BUILD
+++ b/common/m2/repository/org/eclipse/tycho/tycho-p2-facade/0.18.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/eclipse/tycho/tycho-p2/0.18.1/BUILD b/common/m2/repository/org/eclipse/tycho/tycho-p2/0.18.1/BUILD
index add0cb7..186dc5c 100644
--- a/common/m2/repository/org/eclipse/tycho/tycho-p2/0.18.1/BUILD
+++ b/common/m2/repository/org/eclipse/tycho/tycho-p2/0.18.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/eclipse/tycho/tycho/0.18.1/BUILD b/common/m2/repository/org/eclipse/tycho/tycho/0.18.1/BUILD
index 817ce22..ad60452 100644
--- a/common/m2/repository/org/eclipse/tycho/tycho/0.18.1/BUILD
+++ b/common/m2/repository/org/eclipse/tycho/tycho/0.18.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/freemarker/freemarker/2.3.20/BUILD b/common/m2/repository/org/freemarker/freemarker/2.3.20/BUILD
index e3b67e5..f910266 100644
--- a/common/m2/repository/org/freemarker/freemarker/2.3.20/BUILD
+++ b/common/m2/repository/org/freemarker/freemarker/2.3.20/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/gebish/geb-ast/0.9.3/BUILD b/common/m2/repository/org/gebish/geb-ast/0.9.3/BUILD
index 617e29b..39d4542 100644
--- a/common/m2/repository/org/gebish/geb-ast/0.9.3/BUILD
+++ b/common/m2/repository/org/gebish/geb-ast/0.9.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/gebish/geb-core/0.9.3/BUILD b/common/m2/repository/org/gebish/geb-core/0.9.3/BUILD
index aabad51..8977e16 100644
--- a/common/m2/repository/org/gebish/geb-core/0.9.3/BUILD
+++ b/common/m2/repository/org/gebish/geb-core/0.9.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/gebish/geb-implicit-assertions/0.9.3/BUILD b/common/m2/repository/org/gebish/geb-implicit-assertions/0.9.3/BUILD
index 9797ab4..7b28ec6 100644
--- a/common/m2/repository/org/gebish/geb-implicit-assertions/0.9.3/BUILD
+++ b/common/m2/repository/org/gebish/geb-implicit-assertions/0.9.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/gebish/geb-spock/0.9.3/BUILD b/common/m2/repository/org/gebish/geb-spock/0.9.3/BUILD
index bb2fb3d..90df90e 100644
--- a/common/m2/repository/org/gebish/geb-spock/0.9.3/BUILD
+++ b/common/m2/repository/org/gebish/geb-spock/0.9.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/gebish/geb-waiting/0.9.3/BUILD b/common/m2/repository/org/gebish/geb-waiting/0.9.3/BUILD
index 007baa4..617be56 100644
--- a/common/m2/repository/org/gebish/geb-waiting/0.9.3/BUILD
+++ b/common/m2/repository/org/gebish/geb-waiting/0.9.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/glassfish/jaxb/codemodel/2.2.11/BUILD b/common/m2/repository/org/glassfish/jaxb/codemodel/2.2.11/BUILD
index bf65ade..57b9d50 100644
--- a/common/m2/repository/org/glassfish/jaxb/codemodel/2.2.11/BUILD
+++ b/common/m2/repository/org/glassfish/jaxb/codemodel/2.2.11/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/glassfish/jaxb/jaxb-bom/2.2.11/BUILD b/common/m2/repository/org/glassfish/jaxb/jaxb-bom/2.2.11/BUILD
index 487bce9..0e60c4c 100644
--- a/common/m2/repository/org/glassfish/jaxb/jaxb-bom/2.2.11/BUILD
+++ b/common/m2/repository/org/glassfish/jaxb/jaxb-bom/2.2.11/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/glassfish/jaxb/jaxb-core/2.2.11/BUILD b/common/m2/repository/org/glassfish/jaxb/jaxb-core/2.2.11/BUILD
index b402e84..4e34199 100644
--- a/common/m2/repository/org/glassfish/jaxb/jaxb-core/2.2.11/BUILD
+++ b/common/m2/repository/org/glassfish/jaxb/jaxb-core/2.2.11/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/glassfish/jaxb/jaxb-runtime/2.2.11/BUILD b/common/m2/repository/org/glassfish/jaxb/jaxb-runtime/2.2.11/BUILD
index c7431db..0a6ab46 100644
--- a/common/m2/repository/org/glassfish/jaxb/jaxb-runtime/2.2.11/BUILD
+++ b/common/m2/repository/org/glassfish/jaxb/jaxb-runtime/2.2.11/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/glassfish/jaxb/jaxb-xjc/2.2.11/BUILD b/common/m2/repository/org/glassfish/jaxb/jaxb-xjc/2.2.11/BUILD
index 192504a..90017fe 100644
--- a/common/m2/repository/org/glassfish/jaxb/jaxb-xjc/2.2.11/BUILD
+++ b/common/m2/repository/org/glassfish/jaxb/jaxb-xjc/2.2.11/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/glassfish/jaxb/txw2/2.2.11/BUILD b/common/m2/repository/org/glassfish/jaxb/txw2/2.2.11/BUILD
index a476e19..f232f4b 100644
--- a/common/m2/repository/org/glassfish/jaxb/txw2/2.2.11/BUILD
+++ b/common/m2/repository/org/glassfish/jaxb/txw2/2.2.11/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/gradle/gradle-tooling-api/2.0/BUILD b/common/m2/repository/org/gradle/gradle-tooling-api/2.0/BUILD
index e6dfe24..a77119d 100644
--- a/common/m2/repository/org/gradle/gradle-tooling-api/2.0/BUILD
+++ b/common/m2/repository/org/gradle/gradle-tooling-api/2.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/gradle/gradle-tooling-api/2.1/BUILD b/common/m2/repository/org/gradle/gradle-tooling-api/2.1/BUILD
index 1768cef..08f2a4e 100644
--- a/common/m2/repository/org/gradle/gradle-tooling-api/2.1/BUILD
+++ b/common/m2/repository/org/gradle/gradle-tooling-api/2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/gradle/gradle-tooling-api/2.10/BUILD b/common/m2/repository/org/gradle/gradle-tooling-api/2.10/BUILD
index 798f4c2..e14acd9 100644
--- a/common/m2/repository/org/gradle/gradle-tooling-api/2.10/BUILD
+++ b/common/m2/repository/org/gradle/gradle-tooling-api/2.10/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/gradle/gradle-tooling-api/2.14.1/BUILD b/common/m2/repository/org/gradle/gradle-tooling-api/2.14.1/BUILD
index 9d50997..769329c 100644
--- a/common/m2/repository/org/gradle/gradle-tooling-api/2.14.1/BUILD
+++ b/common/m2/repository/org/gradle/gradle-tooling-api/2.14.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/gradle/gradle-tooling-api/2.14/BUILD b/common/m2/repository/org/gradle/gradle-tooling-api/2.14/BUILD
index a177e33..37780c1 100644
--- a/common/m2/repository/org/gradle/gradle-tooling-api/2.14/BUILD
+++ b/common/m2/repository/org/gradle/gradle-tooling-api/2.14/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/gradle/gradle-tooling-api/2.2/BUILD b/common/m2/repository/org/gradle/gradle-tooling-api/2.2/BUILD
index 711c014..d8c5454 100644
--- a/common/m2/repository/org/gradle/gradle-tooling-api/2.2/BUILD
+++ b/common/m2/repository/org/gradle/gradle-tooling-api/2.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/gradle/gradle-tooling-api/2.8/BUILD b/common/m2/repository/org/gradle/gradle-tooling-api/2.8/BUILD
index 0c9409c..8707b22 100644
--- a/common/m2/repository/org/gradle/gradle-tooling-api/2.8/BUILD
+++ b/common/m2/repository/org/gradle/gradle-tooling-api/2.8/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/gradle/gradle-tooling-api/3.2/BUILD b/common/m2/repository/org/gradle/gradle-tooling-api/3.2/BUILD
index bbdd35c..9497b36 100644
--- a/common/m2/repository/org/gradle/gradle-tooling-api/3.2/BUILD
+++ b/common/m2/repository/org/gradle/gradle-tooling-api/3.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/gradle/gradle-tooling-api/3.4-20161207091511+0000/BUILD b/common/m2/repository/org/gradle/gradle-tooling-api/3.4-20161207091511+0000/BUILD
new file mode 100644
index 0000000..13f272b
--- /dev/null
+++ b/common/m2/repository/org/gradle/gradle-tooling-api/3.4-20161207091511+0000/BUILD
@@ -0,0 +1,15 @@
+# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
+
+maven_java_import(
+ name = "jar",
+ jars = ["gradle-tooling-api-3.4-20161207091511+0000.jar"],
+ pom = ":pom",
+ visibility = ["//visibility:public"],
+)
+
+maven_pom(
+ name = "pom",
+ source = "gradle-tooling-api-3.4-20161207091511+0000.pom",
+ visibility = ["//visibility:public"],
+)
diff --git a/common/m2/repository/org/gradle/jarjar/jarjar/1.2.1/BUILD b/common/m2/repository/org/gradle/jarjar/jarjar/1.2.1/BUILD
index b7fdfcd..b4bf41f 100644
--- a/common/m2/repository/org/gradle/jarjar/jarjar/1.2.1/BUILD
+++ b/common/m2/repository/org/gradle/jarjar/jarjar/1.2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/hamcrest/hamcrest-core/1.1/BUILD b/common/m2/repository/org/hamcrest/hamcrest-core/1.1/BUILD
index c0aa9d5..484b1dd 100644
--- a/common/m2/repository/org/hamcrest/hamcrest-core/1.1/BUILD
+++ b/common/m2/repository/org/hamcrest/hamcrest-core/1.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/hamcrest/hamcrest-core/1.3/BUILD b/common/m2/repository/org/hamcrest/hamcrest-core/1.3/BUILD
index 981168f..3dc4b38 100644
--- a/common/m2/repository/org/hamcrest/hamcrest-core/1.3/BUILD
+++ b/common/m2/repository/org/hamcrest/hamcrest-core/1.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/hamcrest/hamcrest-integration/1.1/BUILD b/common/m2/repository/org/hamcrest/hamcrest-integration/1.1/BUILD
index 487940b..e0c1474 100644
--- a/common/m2/repository/org/hamcrest/hamcrest-integration/1.1/BUILD
+++ b/common/m2/repository/org/hamcrest/hamcrest-integration/1.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/hamcrest/hamcrest-integration/1.3/BUILD b/common/m2/repository/org/hamcrest/hamcrest-integration/1.3/BUILD
index 9328704..c882ea0 100644
--- a/common/m2/repository/org/hamcrest/hamcrest-integration/1.3/BUILD
+++ b/common/m2/repository/org/hamcrest/hamcrest-integration/1.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/hamcrest/hamcrest-library/1.1/BUILD b/common/m2/repository/org/hamcrest/hamcrest-library/1.1/BUILD
index 74eb04b..4d6aae9 100644
--- a/common/m2/repository/org/hamcrest/hamcrest-library/1.1/BUILD
+++ b/common/m2/repository/org/hamcrest/hamcrest-library/1.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/hamcrest/hamcrest-library/1.3/BUILD b/common/m2/repository/org/hamcrest/hamcrest-library/1.3/BUILD
index d2c89b0..353a479 100644
--- a/common/m2/repository/org/hamcrest/hamcrest-library/1.3/BUILD
+++ b/common/m2/repository/org/hamcrest/hamcrest-library/1.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/hamcrest/hamcrest-parent/1.1/BUILD b/common/m2/repository/org/hamcrest/hamcrest-parent/1.1/BUILD
index 243cbc1..dbbc86d 100644
--- a/common/m2/repository/org/hamcrest/hamcrest-parent/1.1/BUILD
+++ b/common/m2/repository/org/hamcrest/hamcrest-parent/1.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/hamcrest/hamcrest-parent/1.3/BUILD b/common/m2/repository/org/hamcrest/hamcrest-parent/1.3/BUILD
index 4c80fcd..193286b 100644
--- a/common/m2/repository/org/hamcrest/hamcrest-parent/1.3/BUILD
+++ b/common/m2/repository/org/hamcrest/hamcrest-parent/1.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.agent/0.7.1.201405082137/BUILD b/common/m2/repository/org/jacoco/org.jacoco.agent/0.7.1.201405082137/BUILD
index 75795c9..f06b5ab 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.agent/0.7.1.201405082137/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.agent/0.7.1.201405082137/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.agent/0.7.3.201501221555/BUILD b/common/m2/repository/org/jacoco/org.jacoco.agent/0.7.3.201501221555/BUILD
index 77ea860..1f6cebd 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.agent/0.7.3.201501221555/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.agent/0.7.3.201501221555/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.agent/0.7.4.201502262128/BUILD b/common/m2/repository/org/jacoco/org.jacoco.agent/0.7.4.201502262128/BUILD
index 54743d1..7813054 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.agent/0.7.4.201502262128/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.agent/0.7.4.201502262128/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.agent/0.7.5.201505241946/BUILD b/common/m2/repository/org/jacoco/org.jacoco.agent/0.7.5.201505241946/BUILD
index b54aad0..bba2e8f 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.agent/0.7.5.201505241946/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.agent/0.7.5.201505241946/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.agent/0.7.6.201602180812/BUILD b/common/m2/repository/org/jacoco/org.jacoco.agent/0.7.6.201602180812/BUILD
index c067a34..c540133 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.agent/0.7.6.201602180812/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.agent/0.7.6.201602180812/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.agent/0.7.7.201606060606/BUILD b/common/m2/repository/org/jacoco/org.jacoco.agent/0.7.7.201606060606/BUILD
index dd7e9ce..908f2e0 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.agent/0.7.7.201606060606/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.agent/0.7.7.201606060606/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.ant/0.7.1.201405082137/BUILD b/common/m2/repository/org/jacoco/org.jacoco.ant/0.7.1.201405082137/BUILD
index 2ff9aae..4ce3337 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.ant/0.7.1.201405082137/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.ant/0.7.1.201405082137/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.ant/0.7.3.201501221555/BUILD b/common/m2/repository/org/jacoco/org.jacoco.ant/0.7.3.201501221555/BUILD
index efab375..0998de2 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.ant/0.7.3.201501221555/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.ant/0.7.3.201501221555/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.ant/0.7.4.201502262128/BUILD b/common/m2/repository/org/jacoco/org.jacoco.ant/0.7.4.201502262128/BUILD
index c5ca7bb..d5b5b0a 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.ant/0.7.4.201502262128/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.ant/0.7.4.201502262128/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.ant/0.7.5.201505241946/BUILD b/common/m2/repository/org/jacoco/org.jacoco.ant/0.7.5.201505241946/BUILD
index 4d8aed0..518d7b5 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.ant/0.7.5.201505241946/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.ant/0.7.5.201505241946/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.ant/0.7.6.201602180812/BUILD b/common/m2/repository/org/jacoco/org.jacoco.ant/0.7.6.201602180812/BUILD
index 4143f09..1211a01 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.ant/0.7.6.201602180812/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.ant/0.7.6.201602180812/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.ant/0.7.7.201606060606/BUILD b/common/m2/repository/org/jacoco/org.jacoco.ant/0.7.7.201606060606/BUILD
index 87295ee..372676d 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.ant/0.7.7.201606060606/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.ant/0.7.7.201606060606/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.build/0.7.1.201405082137/BUILD b/common/m2/repository/org/jacoco/org.jacoco.build/0.7.1.201405082137/BUILD
index 56e6b7f..5df997c 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.build/0.7.1.201405082137/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.build/0.7.1.201405082137/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.build/0.7.3.201501221555/BUILD b/common/m2/repository/org/jacoco/org.jacoco.build/0.7.3.201501221555/BUILD
index 138c7ae..fd7e1f5 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.build/0.7.3.201501221555/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.build/0.7.3.201501221555/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.build/0.7.4.201502262128/BUILD b/common/m2/repository/org/jacoco/org.jacoco.build/0.7.4.201502262128/BUILD
index 6e977d2..b08be00 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.build/0.7.4.201502262128/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.build/0.7.4.201502262128/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.build/0.7.5.201505241946/BUILD b/common/m2/repository/org/jacoco/org.jacoco.build/0.7.5.201505241946/BUILD
index c23d382..b26e314 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.build/0.7.5.201505241946/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.build/0.7.5.201505241946/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.build/0.7.6.201602180812/BUILD b/common/m2/repository/org/jacoco/org.jacoco.build/0.7.6.201602180812/BUILD
index 785b53d..a5b8179 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.build/0.7.6.201602180812/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.build/0.7.6.201602180812/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.build/0.7.7.201606060606/BUILD b/common/m2/repository/org/jacoco/org.jacoco.build/0.7.7.201606060606/BUILD
index 16b6e9a..3041613 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.build/0.7.7.201606060606/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.build/0.7.7.201606060606/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.core/0.7.1.201405082137/BUILD b/common/m2/repository/org/jacoco/org.jacoco.core/0.7.1.201405082137/BUILD
index 0d57a78..486fd84 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.core/0.7.1.201405082137/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.core/0.7.1.201405082137/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.core/0.7.3.201501221555/BUILD b/common/m2/repository/org/jacoco/org.jacoco.core/0.7.3.201501221555/BUILD
index 532f83e..6390ae9 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.core/0.7.3.201501221555/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.core/0.7.3.201501221555/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.core/0.7.4.201502262128/BUILD b/common/m2/repository/org/jacoco/org.jacoco.core/0.7.4.201502262128/BUILD
index 7c0d8d4..0e84b84 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.core/0.7.4.201502262128/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.core/0.7.4.201502262128/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.core/0.7.5.201505241946/BUILD b/common/m2/repository/org/jacoco/org.jacoco.core/0.7.5.201505241946/BUILD
index b8457bf..dabd16c 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.core/0.7.5.201505241946/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.core/0.7.5.201505241946/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.core/0.7.6.201602180812/BUILD b/common/m2/repository/org/jacoco/org.jacoco.core/0.7.6.201602180812/BUILD
index 7324a41..fc6656f 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.core/0.7.6.201602180812/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.core/0.7.6.201602180812/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.core/0.7.7.201606060606/BUILD b/common/m2/repository/org/jacoco/org.jacoco.core/0.7.7.201606060606/BUILD
index dfe46cb..24116aa 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.core/0.7.7.201606060606/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.core/0.7.7.201606060606/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.report/0.7.1.201405082137/BUILD b/common/m2/repository/org/jacoco/org.jacoco.report/0.7.1.201405082137/BUILD
index f1df371..daf4a43 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.report/0.7.1.201405082137/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.report/0.7.1.201405082137/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.report/0.7.3.201501221555/BUILD b/common/m2/repository/org/jacoco/org.jacoco.report/0.7.3.201501221555/BUILD
index 062c945..ff683bb 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.report/0.7.3.201501221555/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.report/0.7.3.201501221555/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.report/0.7.4.201502262128/BUILD b/common/m2/repository/org/jacoco/org.jacoco.report/0.7.4.201502262128/BUILD
index a98dd0a..1534d89 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.report/0.7.4.201502262128/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.report/0.7.4.201502262128/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.report/0.7.5.201505241946/BUILD b/common/m2/repository/org/jacoco/org.jacoco.report/0.7.5.201505241946/BUILD
index 578303a..4dfaef3 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.report/0.7.5.201505241946/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.report/0.7.5.201505241946/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.report/0.7.6.201602180812/BUILD b/common/m2/repository/org/jacoco/org.jacoco.report/0.7.6.201602180812/BUILD
index 265c68c..4a57cc6 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.report/0.7.6.201602180812/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.report/0.7.6.201602180812/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jacoco/org.jacoco.report/0.7.7.201606060606/BUILD b/common/m2/repository/org/jacoco/org.jacoco.report/0.7.7.201606060606/BUILD
index feeba10..c752161 100644
--- a/common/m2/repository/org/jacoco/org.jacoco.report/0.7.7.201606060606/BUILD
+++ b/common/m2/repository/org/jacoco/org.jacoco.report/0.7.7.201606060606/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jboss/weld/weld-api-bom/1.0/BUILD b/common/m2/repository/org/jboss/weld/weld-api-bom/1.0/BUILD
index 1622efc..f405c70 100644
--- a/common/m2/repository/org/jboss/weld/weld-api-bom/1.0/BUILD
+++ b/common/m2/repository/org/jboss/weld/weld-api-bom/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jboss/weld/weld-api-parent/1.0/BUILD b/common/m2/repository/org/jboss/weld/weld-api-parent/1.0/BUILD
index 073d2c4..544e2c8 100644
--- a/common/m2/repository/org/jboss/weld/weld-api-parent/1.0/BUILD
+++ b/common/m2/repository/org/jboss/weld/weld-api-parent/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jboss/weld/weld-parent/6/BUILD b/common/m2/repository/org/jboss/weld/weld-parent/6/BUILD
index c85e3a4..60f50f9 100644
--- a/common/m2/repository/org/jboss/weld/weld-parent/6/BUILD
+++ b/common/m2/repository/org/jboss/weld/weld-parent/6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jdeferred/jdeferred-android-aar/1.2.2/BUILD b/common/m2/repository/org/jdeferred/jdeferred-android-aar/1.2.2/BUILD
index b814c42..b4b3312 100644
--- a/common/m2/repository/org/jdeferred/jdeferred-android-aar/1.2.2/BUILD
+++ b/common/m2/repository/org/jdeferred/jdeferred-android-aar/1.2.2/BUILD
@@ -1,5 +1,12 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
+
+maven_aar(
+ name = "aar",
+ aar = "jdeferred-android-aar-1.2.2.aar",
+ pom = ":pom",
+ visibility = ["//visibility:public"],
+)
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jdeferred/jdeferred-android-aar/1.2.3/BUILD b/common/m2/repository/org/jdeferred/jdeferred-android-aar/1.2.3/BUILD
index 7857cc5..266ccdf 100644
--- a/common/m2/repository/org/jdeferred/jdeferred-android-aar/1.2.3/BUILD
+++ b/common/m2/repository/org/jdeferred/jdeferred-android-aar/1.2.3/BUILD
@@ -1,5 +1,12 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
+
+maven_aar(
+ name = "aar",
+ aar = "jdeferred-android-aar-1.2.3.aar",
+ pom = ":pom",
+ visibility = ["//visibility:public"],
+)
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jdeferred/jdeferred-android-parent/1.2.2/BUILD b/common/m2/repository/org/jdeferred/jdeferred-android-parent/1.2.2/BUILD
index 4b234d5..01d5dcc 100644
--- a/common/m2/repository/org/jdeferred/jdeferred-android-parent/1.2.2/BUILD
+++ b/common/m2/repository/org/jdeferred/jdeferred-android-parent/1.2.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jdeferred/jdeferred-android-parent/1.2.3/BUILD b/common/m2/repository/org/jdeferred/jdeferred-android-parent/1.2.3/BUILD
index 1159241..04cd7e2 100644
--- a/common/m2/repository/org/jdeferred/jdeferred-android-parent/1.2.3/BUILD
+++ b/common/m2/repository/org/jdeferred/jdeferred-android-parent/1.2.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jdeferred/jdeferred-core/1.2.2/BUILD b/common/m2/repository/org/jdeferred/jdeferred-core/1.2.2/BUILD
index f714d0e..0b10546 100644
--- a/common/m2/repository/org/jdeferred/jdeferred-core/1.2.2/BUILD
+++ b/common/m2/repository/org/jdeferred/jdeferred-core/1.2.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jdeferred/jdeferred-core/1.2.3/BUILD b/common/m2/repository/org/jdeferred/jdeferred-core/1.2.3/BUILD
index e00b721..a44ba43 100644
--- a/common/m2/repository/org/jdeferred/jdeferred-core/1.2.3/BUILD
+++ b/common/m2/repository/org/jdeferred/jdeferred-core/1.2.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jdeferred/jdeferred-parent/1.2.2/BUILD b/common/m2/repository/org/jdeferred/jdeferred-parent/1.2.2/BUILD
index 8689553..f41f69a 100644
--- a/common/m2/repository/org/jdeferred/jdeferred-parent/1.2.2/BUILD
+++ b/common/m2/repository/org/jdeferred/jdeferred-parent/1.2.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jdeferred/jdeferred-parent/1.2.3/BUILD b/common/m2/repository/org/jdeferred/jdeferred-parent/1.2.3/BUILD
index 3deeb6e..caf42e9 100644
--- a/common/m2/repository/org/jdeferred/jdeferred-parent/1.2.3/BUILD
+++ b/common/m2/repository/org/jdeferred/jdeferred-parent/1.2.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kdoc/0.12.613/BUILD b/common/m2/repository/org/jetbrains/kotlin/kdoc/0.12.613/BUILD
index 1302678..19b36ea 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kdoc/0.12.613/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kdoc/0.12.613/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-android-extensions/1.0.0-rc-1036/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-android-extensions/1.0.0-rc-1036/BUILD
index 69d121b..9cd10e1 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-android-extensions/1.0.0-rc-1036/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-android-extensions/1.0.0-rc-1036/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-android-extensions/1.0.0/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-android-extensions/1.0.0/BUILD
index 1d762f9..b8b62b7 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-android-extensions/1.0.0/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-android-extensions/1.0.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-android-extensions/1.0.2/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-android-extensions/1.0.2/BUILD
index 973d788..c09db66 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-android-extensions/1.0.2/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-android-extensions/1.0.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-android-extensions/1.0.5/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-android-extensions/1.0.5/BUILD
index 95f9cec..dc86df7 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-android-extensions/1.0.5/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-android-extensions/1.0.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/0.12.613/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/0.12.613/BUILD
index 3e903f7..dfee256 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/0.12.613/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/0.12.613/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/0.13.1513/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/0.13.1513/BUILD
index 5e6a066..7ab8437 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/0.13.1513/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/0.13.1513/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/0.13.1514/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/0.13.1514/BUILD
index 5c7c0dd..2717988 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/0.13.1514/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/0.13.1514/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/1.0.0-beta-1103/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/1.0.0-beta-1103/BUILD
index cd8ad2d..905b9bc 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/1.0.0-beta-1103/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/1.0.0-beta-1103/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/1.0.0-beta-4584/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/1.0.0-beta-4584/BUILD
index 132d006..bfd70ed 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/1.0.0-beta-4584/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/1.0.0-beta-4584/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/1.0.0-rc-1036/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/1.0.0-rc-1036/BUILD
index a81baa4..4d95dfe 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/1.0.0-rc-1036/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/1.0.0-rc-1036/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/1.0.0/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/1.0.0/BUILD
index dbed6f6..e1e8f78 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/1.0.0/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/1.0.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/1.0.2/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/1.0.2/BUILD
index dcc3d8d..1f8112f 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/1.0.2/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/1.0.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/1.0.5/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/1.0.5/BUILD
index ed596d0..676431e 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/1.0.5/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-annotation-processing/1.0.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/0.13.1513/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/0.13.1513/BUILD
index 360454e..e609e35 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/0.13.1513/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/0.13.1513/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/0.13.1514/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/0.13.1514/BUILD
index 3fee593..a890049 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/0.13.1514/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/0.13.1514/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.0-beta-1103/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.0-beta-1103/BUILD
index 56f23b6..1e01ba6 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.0-beta-1103/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.0-beta-1103/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.0-beta-4584/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.0-beta-4584/BUILD
index 8d7206f..21abd47 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.0-beta-4584/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.0-beta-4584/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.0-rc-1036/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.0-rc-1036/BUILD
index 16b955f..c9cc92b 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.0-rc-1036/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.0-rc-1036/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.0/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.0/BUILD
index a650a22..435ce4d 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.0/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.2/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.2/BUILD
index 3ecdc7e..e4623d3 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.2/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.5/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.5/BUILD
index 826ba15..6bb9411 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.5/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler/0.12.613/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler/0.12.613/BUILD
index 830e216..0f2de50 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler/0.12.613/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-compiler/0.12.613/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/0.12.613/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/0.12.613/BUILD
index 271006a..64f97cc 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/0.12.613/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/0.12.613/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/0.13.1513/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/0.13.1513/BUILD
index 793941e..c4d63c8 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/0.13.1513/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/0.13.1513/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/0.13.1514/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/0.13.1514/BUILD
index adf5530..6b2f3bf 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/0.13.1514/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/0.13.1514/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.0.0-beta-1103/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.0.0-beta-1103/BUILD
index d51bbc1..3339efc 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.0.0-beta-1103/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.0.0-beta-1103/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.0.0-beta-4584/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.0.0-beta-4584/BUILD
index bc90701..2e800e7 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.0.0-beta-4584/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.0.0-beta-4584/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.0.0-rc-1036/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.0.0-rc-1036/BUILD
index 0fbd7ba..bd2d508 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.0.0-rc-1036/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.0.0-rc-1036/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.0.0/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.0.0/BUILD
index d42db4b..b8b3041 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.0.0/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.0.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.0.2/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.0.2/BUILD
index e0a2e3e..c5b8f2c 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.0.2/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.0.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.0.5/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.0.5/BUILD
index 32a3085..ff66f3f 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.0.5/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.0.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/0.12.613/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/0.12.613/BUILD
index 32b3180..e28b021 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/0.12.613/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/0.12.613/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/0.13.1513/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/0.13.1513/BUILD
index e044f79..16e1531 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/0.13.1513/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/0.13.1513/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/0.13.1514/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/0.13.1514/BUILD
index 92759e6..3c49f1e 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/0.13.1514/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/0.13.1514/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/1.0.0-beta-1103/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/1.0.0-beta-1103/BUILD
index 831e8ad..fcd995f 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/1.0.0-beta-1103/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/1.0.0-beta-1103/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/1.0.0-beta-4584/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/1.0.0-beta-4584/BUILD
index 8b440a3..cca8d1a 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/1.0.0-beta-4584/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/1.0.0-beta-4584/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/1.0.0-rc-1036/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/1.0.0-rc-1036/BUILD
index e8f964f..f1588c9 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/1.0.0-rc-1036/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/1.0.0-rc-1036/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/1.0.0/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/1.0.0/BUILD
index 93f5b95..9d43b52 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/1.0.0/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/1.0.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/1.0.2/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/1.0.2/BUILD
index 6208415..2c0e06e 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/1.0.2/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin-core/1.0.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/0.12.613/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/0.12.613/BUILD
index d378327..8c3fa3e 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/0.12.613/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/0.12.613/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/0.13.1513/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/0.13.1513/BUILD
index 6a8584f..b178259 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/0.13.1513/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/0.13.1513/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/0.13.1514/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/0.13.1514/BUILD
index 29b2bff..19c4b15 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/0.13.1514/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/0.13.1514/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.0.0-beta-1103/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.0.0-beta-1103/BUILD
index a1d5f48..f9094ab 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.0.0-beta-1103/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.0.0-beta-1103/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.0.0-beta-4584/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.0.0-beta-4584/BUILD
index 60566a7..12c0849 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.0.0-beta-4584/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.0.0-beta-4584/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.0.0-rc-1036/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.0.0-rc-1036/BUILD
index 3861b29..1567cc3 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.0.0-rc-1036/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.0.0-rc-1036/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.0.0/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.0.0/BUILD
index dad1ca8..d7f0a37 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.0.0/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.0.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.0.2/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.0.2/BUILD
index bda8235..662c7c3 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.0.2/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.0.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.0.5/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.0.5/BUILD
index 00fb58d..db77d35 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.0.5/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.0.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-jdk-annotations/0.12.613/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-jdk-annotations/0.12.613/BUILD
index 319f439..8f59076 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-jdk-annotations/0.12.613/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-jdk-annotations/0.12.613/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-jdk-annotations/0.13.1513/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-jdk-annotations/0.13.1513/BUILD
index 8acdf9c..8a338e0 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-jdk-annotations/0.13.1513/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-jdk-annotations/0.13.1513/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-jdk-annotations/0.13.1514/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-jdk-annotations/0.13.1514/BUILD
index d12d3c3..68ce81e 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-jdk-annotations/0.13.1514/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-jdk-annotations/0.13.1514/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-project/0.12.613/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-project/0.12.613/BUILD
index 46f62a2..e5090e7 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-project/0.12.613/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-project/0.12.613/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-project/0.13.1513/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-project/0.13.1513/BUILD
index 38889a2..933c69e 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-project/0.13.1513/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-project/0.13.1513/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-project/0.13.1514/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-project/0.13.1514/BUILD
index 08ac09f..9abdd93 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-project/0.13.1514/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-project/0.13.1514/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-project/1.0.0-beta-1103/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-project/1.0.0-beta-1103/BUILD
index 1e7c377..4c5178a 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-project/1.0.0-beta-1103/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-project/1.0.0-beta-1103/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-project/1.0.0-beta-4584/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-project/1.0.0-beta-4584/BUILD
index 69a53df..0746ed7 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-project/1.0.0-beta-4584/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-project/1.0.0-beta-4584/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-project/1.0.0-rc-1036/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-project/1.0.0-rc-1036/BUILD
index 06fc500..1b68035 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-project/1.0.0-rc-1036/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-project/1.0.0-rc-1036/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-project/1.0.0/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-project/1.0.0/BUILD
index 3f057ee..f550c9a 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-project/1.0.0/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-project/1.0.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-project/1.0.2/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-project/1.0.2/BUILD
index 0ba2a1a..17a18ab 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-project/1.0.2/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-project/1.0.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-project/1.0.5/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-project/1.0.5/BUILD
index 3f2599e..b582b7a 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-project/1.0.5/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-project/1.0.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/0.12.613/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/0.12.613/BUILD
index 968119a..267b81c 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/0.12.613/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/0.12.613/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/0.13.1513/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/0.13.1513/BUILD
index ebb28f1..2f10d0d 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/0.13.1513/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/0.13.1513/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/0.13.1514/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/0.13.1514/BUILD
index 9afbb27..ad81686 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/0.13.1514/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/0.13.1514/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-1103/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-1103/BUILD
index 9176d02..acadb8b 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-1103/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-1103/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-4584/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-4584/BUILD
index 74f54ae..dc323cd 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-4584/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.0-beta-4584/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.0-rc-1036/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.0-rc-1036/BUILD
index 85dc03d..df7c302 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.0-rc-1036/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.0-rc-1036/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.0/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.0/BUILD
index 015f04f..ef3dc94 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.0/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.2/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.2/BUILD
index 91fd3ad..929d80c 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.2/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.5/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.5/BUILD
index f7822d9..e66ceea 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.5/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/0.12.613/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/0.12.613/BUILD
index 62fc423..ef2978f 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/0.12.613/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/0.12.613/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/0.13.1513/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/0.13.1513/BUILD
index 04d8493..58559dc 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/0.13.1513/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/0.13.1513/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/0.13.1514/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/0.13.1514/BUILD
index c8ec54f..04491c6 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/0.13.1514/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/0.13.1514/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-beta-1103/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-beta-1103/BUILD
index 1a049fa..167bec4 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-beta-1103/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-beta-1103/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-beta-4584/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-beta-4584/BUILD
index 48822bb..5a60497 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-beta-4584/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-beta-4584/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-rc-1036/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-rc-1036/BUILD
index 38f7218..4d8c473 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-rc-1036/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.0-rc-1036/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.0/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.0/BUILD
index 3ed967f..5814136 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.0/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.2/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.2/BUILD
index e3d4fab..39404c6 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.2/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.5/BUILD b/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.5/BUILD
index dddb694..0e95f08 100644
--- a/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.5/BUILD
+++ b/common/m2/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/json/json/20080701/BUILD b/common/m2/repository/org/json/json/20080701/BUILD
index 46bbbd5..46e068d 100644
--- a/common/m2/repository/org/json/json/20080701/BUILD
+++ b/common/m2/repository/org/json/json/20080701/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jsoup/jsoup/1.6.3/BUILD b/common/m2/repository/org/jsoup/jsoup/1.6.3/BUILD
index 7f204d0..378a45e 100644
--- a/common/m2/repository/org/jsoup/jsoup/1.6.3/BUILD
+++ b/common/m2/repository/org/jsoup/jsoup/1.6.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jsoup/jsoup/1.7.3/BUILD b/common/m2/repository/org/jsoup/jsoup/1.7.3/BUILD
index 3b781ed..a825832 100644
--- a/common/m2/repository/org/jsoup/jsoup/1.7.3/BUILD
+++ b/common/m2/repository/org/jsoup/jsoup/1.7.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/jvnet/staxex/stax-ex/1.7.7/BUILD b/common/m2/repository/org/jvnet/staxex/stax-ex/1.7.7/BUILD
index 29fd6b8..6fb9506 100644
--- a/common/m2/repository/org/jvnet/staxex/stax-ex/1.7.7/BUILD
+++ b/common/m2/repository/org/jvnet/staxex/stax-ex/1.7.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/khronos/opengl-api/gl1.1-android-2.1_r1/BUILD b/common/m2/repository/org/khronos/opengl-api/gl1.1-android-2.1_r1/BUILD
index b81d15e..d75970c 100644
--- a/common/m2/repository/org/khronos/opengl-api/gl1.1-android-2.1_r1/BUILD
+++ b/common/m2/repository/org/khronos/opengl-api/gl1.1-android-2.1_r1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/mockito/mockito-all/1.9.5/BUILD b/common/m2/repository/org/mockito/mockito-all/1.9.5/BUILD
index 69e10a5..ed261a1 100644
--- a/common/m2/repository/org/mockito/mockito-all/1.9.5/BUILD
+++ b/common/m2/repository/org/mockito/mockito-all/1.9.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/mockito/mockito-core/1.9.5/BUILD b/common/m2/repository/org/mockito/mockito-core/1.9.5/BUILD
index 4fc6700..ab6ef7e 100644
--- a/common/m2/repository/org/mockito/mockito-core/1.9.5/BUILD
+++ b/common/m2/repository/org/mockito/mockito-core/1.9.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/mockito/mockito-core/2.2.5/BUILD b/common/m2/repository/org/mockito/mockito-core/2.2.5/BUILD
index 3b9bbe7..fe54ad7 100644
--- a/common/m2/repository/org/mockito/mockito-core/2.2.5/BUILD
+++ b/common/m2/repository/org/mockito/mockito-core/2.2.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/mozilla/rhino/1.7R3/BUILD b/common/m2/repository/org/mozilla/rhino/1.7R3/BUILD
index 3b7fd82..873b6d1 100644
--- a/common/m2/repository/org/mozilla/rhino/1.7R3/BUILD
+++ b/common/m2/repository/org/mozilla/rhino/1.7R3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/objenesis/objenesis-parent/1.2/BUILD b/common/m2/repository/org/objenesis/objenesis-parent/1.2/BUILD
index 259803b..aad4bfe 100644
--- a/common/m2/repository/org/objenesis/objenesis-parent/1.2/BUILD
+++ b/common/m2/repository/org/objenesis/objenesis-parent/1.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/objenesis/objenesis-parent/2.1/BUILD b/common/m2/repository/org/objenesis/objenesis-parent/2.1/BUILD
index 47b28ce..43ac6c2 100644
--- a/common/m2/repository/org/objenesis/objenesis-parent/2.1/BUILD
+++ b/common/m2/repository/org/objenesis/objenesis-parent/2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/objenesis/objenesis-parent/2.4/BUILD b/common/m2/repository/org/objenesis/objenesis-parent/2.4/BUILD
index 901cb96..d5f550d 100644
--- a/common/m2/repository/org/objenesis/objenesis-parent/2.4/BUILD
+++ b/common/m2/repository/org/objenesis/objenesis-parent/2.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/objenesis/objenesis/1.0/BUILD b/common/m2/repository/org/objenesis/objenesis/1.0/BUILD
index d68890f..b6db981 100644
--- a/common/m2/repository/org/objenesis/objenesis/1.0/BUILD
+++ b/common/m2/repository/org/objenesis/objenesis/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/objenesis/objenesis/1.2/BUILD b/common/m2/repository/org/objenesis/objenesis/1.2/BUILD
index 3cbd645..6300a24 100644
--- a/common/m2/repository/org/objenesis/objenesis/1.2/BUILD
+++ b/common/m2/repository/org/objenesis/objenesis/1.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/objenesis/objenesis/2.1/BUILD b/common/m2/repository/org/objenesis/objenesis/2.1/BUILD
index 8ef9b5b..4691de5 100644
--- a/common/m2/repository/org/objenesis/objenesis/2.1/BUILD
+++ b/common/m2/repository/org/objenesis/objenesis/2.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/objenesis/objenesis/2.4/BUILD b/common/m2/repository/org/objenesis/objenesis/2.4/BUILD
index d6b4038..4810e6b 100644
--- a/common/m2/repository/org/objenesis/objenesis/2.4/BUILD
+++ b/common/m2/repository/org/objenesis/objenesis/2.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ow2/asm/asm-analysis/4.0/BUILD b/common/m2/repository/org/ow2/asm/asm-analysis/4.0/BUILD
index 6cf1909..4c79d05 100644
--- a/common/m2/repository/org/ow2/asm/asm-analysis/4.0/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm-analysis/4.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ow2/asm/asm-analysis/5.0.1/BUILD b/common/m2/repository/org/ow2/asm/asm-analysis/5.0.1/BUILD
index 002f27a..28fa3f9 100644
--- a/common/m2/repository/org/ow2/asm/asm-analysis/5.0.1/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm-analysis/5.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ow2/asm/asm-analysis/5.0.3/BUILD b/common/m2/repository/org/ow2/asm/asm-analysis/5.0.3/BUILD
index 775986a..24fb135 100644
--- a/common/m2/repository/org/ow2/asm/asm-analysis/5.0.3/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm-analysis/5.0.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ow2/asm/asm-analysis/5.0.4/BUILD b/common/m2/repository/org/ow2/asm/asm-analysis/5.0.4/BUILD
index 450b797..ce5a9bd 100644
--- a/common/m2/repository/org/ow2/asm/asm-analysis/5.0.4/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm-analysis/5.0.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ow2/asm/asm-commons/5.0.1/BUILD b/common/m2/repository/org/ow2/asm/asm-commons/5.0.1/BUILD
index dd00451..b4e027d 100644
--- a/common/m2/repository/org/ow2/asm/asm-commons/5.0.1/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm-commons/5.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ow2/asm/asm-commons/5.0.3/BUILD b/common/m2/repository/org/ow2/asm/asm-commons/5.0.3/BUILD
index 4e8e74e..39f6aa7 100644
--- a/common/m2/repository/org/ow2/asm/asm-commons/5.0.3/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm-commons/5.0.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ow2/asm/asm-commons/5.0.4/BUILD b/common/m2/repository/org/ow2/asm/asm-commons/5.0.4/BUILD
index 7422163..54215ec 100644
--- a/common/m2/repository/org/ow2/asm/asm-commons/5.0.4/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm-commons/5.0.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ow2/asm/asm-debug-all/5.0.1/BUILD b/common/m2/repository/org/ow2/asm/asm-debug-all/5.0.1/BUILD
index 707abf1..ef8e1d0 100644
--- a/common/m2/repository/org/ow2/asm/asm-debug-all/5.0.1/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm-debug-all/5.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ow2/asm/asm-debug-all/5.0.2/BUILD b/common/m2/repository/org/ow2/asm/asm-debug-all/5.0.2/BUILD
index 8658afb..cf4f4c9 100644
--- a/common/m2/repository/org/ow2/asm/asm-debug-all/5.0.2/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm-debug-all/5.0.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ow2/asm/asm-debug-all/5.0.4/BUILD b/common/m2/repository/org/ow2/asm/asm-debug-all/5.0.4/BUILD
index 63e89d8..12d6731 100644
--- a/common/m2/repository/org/ow2/asm/asm-debug-all/5.0.4/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm-debug-all/5.0.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ow2/asm/asm-debug-all/5.1/BUILD b/common/m2/repository/org/ow2/asm/asm-debug-all/5.1/BUILD
index 5cad919..7a059ee 100644
--- a/common/m2/repository/org/ow2/asm/asm-debug-all/5.1/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm-debug-all/5.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ow2/asm/asm-parent/4.0/BUILD b/common/m2/repository/org/ow2/asm/asm-parent/4.0/BUILD
index e3edb54..00a85ba 100644
--- a/common/m2/repository/org/ow2/asm/asm-parent/4.0/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm-parent/4.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/ow2/asm/asm-parent/4.1/BUILD b/common/m2/repository/org/ow2/asm/asm-parent/4.1/BUILD
index 5321da1..4321f63 100644
--- a/common/m2/repository/org/ow2/asm/asm-parent/4.1/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm-parent/4.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/ow2/asm/asm-parent/5.0.1/BUILD b/common/m2/repository/org/ow2/asm/asm-parent/5.0.1/BUILD
index 9f6c5d7..9ed7a73 100644
--- a/common/m2/repository/org/ow2/asm/asm-parent/5.0.1/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm-parent/5.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/ow2/asm/asm-parent/5.0.2/BUILD b/common/m2/repository/org/ow2/asm/asm-parent/5.0.2/BUILD
index 07ad81c..085aa8f 100644
--- a/common/m2/repository/org/ow2/asm/asm-parent/5.0.2/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm-parent/5.0.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/ow2/asm/asm-parent/5.0.3/BUILD b/common/m2/repository/org/ow2/asm/asm-parent/5.0.3/BUILD
index 72de970..c3d74a4 100644
--- a/common/m2/repository/org/ow2/asm/asm-parent/5.0.3/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm-parent/5.0.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/ow2/asm/asm-parent/5.0.4/BUILD b/common/m2/repository/org/ow2/asm/asm-parent/5.0.4/BUILD
index f054e38..66818a2 100644
--- a/common/m2/repository/org/ow2/asm/asm-parent/5.0.4/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm-parent/5.0.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/ow2/asm/asm-parent/5.1/BUILD b/common/m2/repository/org/ow2/asm/asm-parent/5.1/BUILD
index 2a95902..9cbf5e4 100644
--- a/common/m2/repository/org/ow2/asm/asm-parent/5.1/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm-parent/5.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/ow2/asm/asm-tree/4.0/BUILD b/common/m2/repository/org/ow2/asm/asm-tree/4.0/BUILD
index d514049..0d78c3f 100644
--- a/common/m2/repository/org/ow2/asm/asm-tree/4.0/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm-tree/4.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ow2/asm/asm-tree/5.0.1/BUILD b/common/m2/repository/org/ow2/asm/asm-tree/5.0.1/BUILD
index 41a410f..647cbba 100644
--- a/common/m2/repository/org/ow2/asm/asm-tree/5.0.1/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm-tree/5.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ow2/asm/asm-tree/5.0.3/BUILD b/common/m2/repository/org/ow2/asm/asm-tree/5.0.3/BUILD
index a29d5b9..093314b 100644
--- a/common/m2/repository/org/ow2/asm/asm-tree/5.0.3/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm-tree/5.0.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ow2/asm/asm-tree/5.0.4/BUILD b/common/m2/repository/org/ow2/asm/asm-tree/5.0.4/BUILD
index 6663bf1..fba9738 100644
--- a/common/m2/repository/org/ow2/asm/asm-tree/5.0.4/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm-tree/5.0.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ow2/asm/asm-util/5.0.1/BUILD b/common/m2/repository/org/ow2/asm/asm-util/5.0.1/BUILD
index 67314e5..0551f72 100644
--- a/common/m2/repository/org/ow2/asm/asm-util/5.0.1/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm-util/5.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ow2/asm/asm-util/5.0.3/BUILD b/common/m2/repository/org/ow2/asm/asm-util/5.0.3/BUILD
index 1b6881a..d4953d5 100644
--- a/common/m2/repository/org/ow2/asm/asm-util/5.0.3/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm-util/5.0.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ow2/asm/asm-util/5.0.4/BUILD b/common/m2/repository/org/ow2/asm/asm-util/5.0.4/BUILD
index d9d0529..2dd4107 100644
--- a/common/m2/repository/org/ow2/asm/asm-util/5.0.4/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm-util/5.0.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ow2/asm/asm/4.0/BUILD b/common/m2/repository/org/ow2/asm/asm/4.0/BUILD
index c82cd06..12a9819 100644
--- a/common/m2/repository/org/ow2/asm/asm/4.0/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm/4.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ow2/asm/asm/4.1/BUILD b/common/m2/repository/org/ow2/asm/asm/4.1/BUILD
index 3774dbd..565c74f 100644
--- a/common/m2/repository/org/ow2/asm/asm/4.1/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm/4.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ow2/asm/asm/5.0.1/BUILD b/common/m2/repository/org/ow2/asm/asm/5.0.1/BUILD
index 967d178..da341b1 100644
--- a/common/m2/repository/org/ow2/asm/asm/5.0.1/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm/5.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ow2/asm/asm/5.0.3/BUILD b/common/m2/repository/org/ow2/asm/asm/5.0.3/BUILD
index f8778e6..f9954ff 100644
--- a/common/m2/repository/org/ow2/asm/asm/5.0.3/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm/5.0.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ow2/asm/asm/5.0.4/BUILD b/common/m2/repository/org/ow2/asm/asm/5.0.4/BUILD
index 4b356f0..6b37b79 100644
--- a/common/m2/repository/org/ow2/asm/asm/5.0.4/BUILD
+++ b/common/m2/repository/org/ow2/asm/asm/5.0.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/ow2/ow2/1.3/BUILD b/common/m2/repository/org/ow2/ow2/1.3/BUILD
index 0ef06e9..4f2ae66 100644
--- a/common/m2/repository/org/ow2/ow2/1.3/BUILD
+++ b/common/m2/repository/org/ow2/ow2/1.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/parboiled/parboiled-core/1.0.2/BUILD b/common/m2/repository/org/parboiled/parboiled-core/1.0.2/BUILD
index 122e784..e0fc964 100644
--- a/common/m2/repository/org/parboiled/parboiled-core/1.0.2/BUILD
+++ b/common/m2/repository/org/parboiled/parboiled-core/1.0.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/parboiled/parboiled-java/1.0.2/BUILD b/common/m2/repository/org/parboiled/parboiled-java/1.0.2/BUILD
index 40b9f62..a0e1960 100644
--- a/common/m2/repository/org/parboiled/parboiled-java/1.0.2/BUILD
+++ b/common/m2/repository/org/parboiled/parboiled-java/1.0.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/pegdown/pegdown/1.1.0/BUILD b/common/m2/repository/org/pegdown/pegdown/1.1.0/BUILD
index ec4e4fd..fc0cfd1 100644
--- a/common/m2/repository/org/pegdown/pegdown/1.1.0/BUILD
+++ b/common/m2/repository/org/pegdown/pegdown/1.1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/python/jython-standalone/2.5.3/BUILD b/common/m2/repository/org/python/jython-standalone/2.5.3/BUILD
index d81c248..0d695f5 100644
--- a/common/m2/repository/org/python/jython-standalone/2.5.3/BUILD
+++ b/common/m2/repository/org/python/jython-standalone/2.5.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/python/jython/2.5.3/BUILD b/common/m2/repository/org/python/jython/2.5.3/BUILD
index dab91cf..6ad6bab 100644
--- a/common/m2/repository/org/python/jython/2.5.3/BUILD
+++ b/common/m2/repository/org/python/jython/2.5.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/reficio/p2-maven-plugin/1.1.0/BUILD b/common/m2/repository/org/reficio/p2-maven-plugin/1.1.0/BUILD
index 81bb021..b8b03fd 100644
--- a/common/m2/repository/org/reficio/p2-maven-plugin/1.1.0/BUILD
+++ b/common/m2/repository/org/reficio/p2-maven-plugin/1.1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/seleniumhq/selenium/selenium-api/2.42.2/BUILD b/common/m2/repository/org/seleniumhq/selenium/selenium-api/2.42.2/BUILD
index 417a2a1..f6e497f 100644
--- a/common/m2/repository/org/seleniumhq/selenium/selenium-api/2.42.2/BUILD
+++ b/common/m2/repository/org/seleniumhq/selenium/selenium-api/2.42.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/seleniumhq/selenium/selenium-htmlunit-driver/2.42.2/BUILD b/common/m2/repository/org/seleniumhq/selenium/selenium-htmlunit-driver/2.42.2/BUILD
index fea4dbb..6675a88 100644
--- a/common/m2/repository/org/seleniumhq/selenium/selenium-htmlunit-driver/2.42.2/BUILD
+++ b/common/m2/repository/org/seleniumhq/selenium/selenium-htmlunit-driver/2.42.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/seleniumhq/selenium/selenium-parent/2.42.2/BUILD b/common/m2/repository/org/seleniumhq/selenium/selenium-parent/2.42.2/BUILD
index 9f43383..0c620b5 100644
--- a/common/m2/repository/org/seleniumhq/selenium/selenium-parent/2.42.2/BUILD
+++ b/common/m2/repository/org/seleniumhq/selenium/selenium-parent/2.42.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/seleniumhq/selenium/selenium-remote-driver/2.42.2/BUILD b/common/m2/repository/org/seleniumhq/selenium/selenium-remote-driver/2.42.2/BUILD
index 50dd04b..6544c11 100644
--- a/common/m2/repository/org/seleniumhq/selenium/selenium-remote-driver/2.42.2/BUILD
+++ b/common/m2/repository/org/seleniumhq/selenium/selenium-remote-driver/2.42.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/slf4j/jcl-over-slf4j/1.6.2/BUILD b/common/m2/repository/org/slf4j/jcl-over-slf4j/1.6.2/BUILD
index c46bd48..ddafa16 100644
--- a/common/m2/repository/org/slf4j/jcl-over-slf4j/1.6.2/BUILD
+++ b/common/m2/repository/org/slf4j/jcl-over-slf4j/1.6.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/slf4j/slf4j-api/1.5.10/BUILD b/common/m2/repository/org/slf4j/slf4j-api/1.5.10/BUILD
index fe413bd..79cee30 100644
--- a/common/m2/repository/org/slf4j/slf4j-api/1.5.10/BUILD
+++ b/common/m2/repository/org/slf4j/slf4j-api/1.5.10/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/slf4j/slf4j-api/1.6.2/BUILD b/common/m2/repository/org/slf4j/slf4j-api/1.6.2/BUILD
index 1474143..6bbd1f3 100644
--- a/common/m2/repository/org/slf4j/slf4j-api/1.6.2/BUILD
+++ b/common/m2/repository/org/slf4j/slf4j-api/1.6.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/slf4j/slf4j-api/1.7.10/BUILD b/common/m2/repository/org/slf4j/slf4j-api/1.7.10/BUILD
index 9034912..509228a 100644
--- a/common/m2/repository/org/slf4j/slf4j-api/1.7.10/BUILD
+++ b/common/m2/repository/org/slf4j/slf4j-api/1.7.10/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/slf4j/slf4j-api/1.7.12/BUILD b/common/m2/repository/org/slf4j/slf4j-api/1.7.12/BUILD
index 4e742e5..f1e5e65 100644
--- a/common/m2/repository/org/slf4j/slf4j-api/1.7.12/BUILD
+++ b/common/m2/repository/org/slf4j/slf4j-api/1.7.12/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/slf4j/slf4j-api/1.7.2/BUILD b/common/m2/repository/org/slf4j/slf4j-api/1.7.2/BUILD
index ee94b4c..2fbae5f 100644
--- a/common/m2/repository/org/slf4j/slf4j-api/1.7.2/BUILD
+++ b/common/m2/repository/org/slf4j/slf4j-api/1.7.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/slf4j/slf4j-api/1.7.5/BUILD b/common/m2/repository/org/slf4j/slf4j-api/1.7.5/BUILD
index ea29d07..522980a 100644
--- a/common/m2/repository/org/slf4j/slf4j-api/1.7.5/BUILD
+++ b/common/m2/repository/org/slf4j/slf4j-api/1.7.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/slf4j/slf4j-api/1.7.7/BUILD b/common/m2/repository/org/slf4j/slf4j-api/1.7.7/BUILD
index 754d77a..e5c2a2c 100644
--- a/common/m2/repository/org/slf4j/slf4j-api/1.7.7/BUILD
+++ b/common/m2/repository/org/slf4j/slf4j-api/1.7.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/slf4j/slf4j-parent/1.5.10/BUILD b/common/m2/repository/org/slf4j/slf4j-parent/1.5.10/BUILD
index 9183ee4..8f48a46 100644
--- a/common/m2/repository/org/slf4j/slf4j-parent/1.5.10/BUILD
+++ b/common/m2/repository/org/slf4j/slf4j-parent/1.5.10/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/slf4j/slf4j-parent/1.6.2/BUILD b/common/m2/repository/org/slf4j/slf4j-parent/1.6.2/BUILD
index edb2705..beb62e1 100644
--- a/common/m2/repository/org/slf4j/slf4j-parent/1.6.2/BUILD
+++ b/common/m2/repository/org/slf4j/slf4j-parent/1.6.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/slf4j/slf4j-parent/1.7.10/BUILD b/common/m2/repository/org/slf4j/slf4j-parent/1.7.10/BUILD
index 2435257..c7fb2db 100644
--- a/common/m2/repository/org/slf4j/slf4j-parent/1.7.10/BUILD
+++ b/common/m2/repository/org/slf4j/slf4j-parent/1.7.10/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/slf4j/slf4j-parent/1.7.12/BUILD b/common/m2/repository/org/slf4j/slf4j-parent/1.7.12/BUILD
index 9df15d5..5c0b71b 100644
--- a/common/m2/repository/org/slf4j/slf4j-parent/1.7.12/BUILD
+++ b/common/m2/repository/org/slf4j/slf4j-parent/1.7.12/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/slf4j/slf4j-parent/1.7.2/BUILD b/common/m2/repository/org/slf4j/slf4j-parent/1.7.2/BUILD
index e635180..511104d 100644
--- a/common/m2/repository/org/slf4j/slf4j-parent/1.7.2/BUILD
+++ b/common/m2/repository/org/slf4j/slf4j-parent/1.7.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/slf4j/slf4j-parent/1.7.5/BUILD b/common/m2/repository/org/slf4j/slf4j-parent/1.7.5/BUILD
index a8da2e8..f892da7 100644
--- a/common/m2/repository/org/slf4j/slf4j-parent/1.7.5/BUILD
+++ b/common/m2/repository/org/slf4j/slf4j-parent/1.7.5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/slf4j/slf4j-parent/1.7.7/BUILD b/common/m2/repository/org/slf4j/slf4j-parent/1.7.7/BUILD
index a354955..d755a50 100644
--- a/common/m2/repository/org/slf4j/slf4j-parent/1.7.7/BUILD
+++ b/common/m2/repository/org/slf4j/slf4j-parent/1.7.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/slf4j/slf4j-simple/1.7.2/BUILD b/common/m2/repository/org/slf4j/slf4j-simple/1.7.2/BUILD
index a8fa13d..bb8e798 100644
--- a/common/m2/repository/org/slf4j/slf4j-simple/1.7.2/BUILD
+++ b/common/m2/repository/org/slf4j/slf4j-simple/1.7.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/smali/dexlib2/2.1.3/BUILD b/common/m2/repository/org/smali/dexlib2/2.1.3/BUILD
index a403265..ad19629 100644
--- a/common/m2/repository/org/smali/dexlib2/2.1.3/BUILD
+++ b/common/m2/repository/org/smali/dexlib2/2.1.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/smali/util/2.1.3/BUILD b/common/m2/repository/org/smali/util/2.1.3/BUILD
index 417b753..be65066 100644
--- a/common/m2/repository/org/smali/util/2.1.3/BUILD
+++ b/common/m2/repository/org/smali/util/2.1.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/sonatype/aether/aether-api/1.7/BUILD b/common/m2/repository/org/sonatype/aether/aether-api/1.7/BUILD
index 9a2e10b..5461422 100644
--- a/common/m2/repository/org/sonatype/aether/aether-api/1.7/BUILD
+++ b/common/m2/repository/org/sonatype/aether/aether-api/1.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/sonatype/aether/aether-impl/1.7/BUILD b/common/m2/repository/org/sonatype/aether/aether-impl/1.7/BUILD
index 8c23af0..c1290ad 100644
--- a/common/m2/repository/org/sonatype/aether/aether-impl/1.7/BUILD
+++ b/common/m2/repository/org/sonatype/aether/aether-impl/1.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/sonatype/aether/aether-parent/1.7/BUILD b/common/m2/repository/org/sonatype/aether/aether-parent/1.7/BUILD
index f8fa115..43cef6f 100644
--- a/common/m2/repository/org/sonatype/aether/aether-parent/1.7/BUILD
+++ b/common/m2/repository/org/sonatype/aether/aether-parent/1.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/sonatype/aether/aether-spi/1.7/BUILD b/common/m2/repository/org/sonatype/aether/aether-spi/1.7/BUILD
index deecf2b..02796ca 100644
--- a/common/m2/repository/org/sonatype/aether/aether-spi/1.7/BUILD
+++ b/common/m2/repository/org/sonatype/aether/aether-spi/1.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/sonatype/aether/aether-util/1.7/BUILD b/common/m2/repository/org/sonatype/aether/aether-util/1.7/BUILD
index 38d7399..062dceb 100644
--- a/common/m2/repository/org/sonatype/aether/aether-util/1.7/BUILD
+++ b/common/m2/repository/org/sonatype/aether/aether-util/1.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/sonatype/forge/forge-parent/10/BUILD b/common/m2/repository/org/sonatype/forge/forge-parent/10/BUILD
index 73d0e7a..4a6a0f8 100644
--- a/common/m2/repository/org/sonatype/forge/forge-parent/10/BUILD
+++ b/common/m2/repository/org/sonatype/forge/forge-parent/10/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/sonatype/forge/forge-parent/4/BUILD b/common/m2/repository/org/sonatype/forge/forge-parent/4/BUILD
index 9503073..859b0c4 100644
--- a/common/m2/repository/org/sonatype/forge/forge-parent/4/BUILD
+++ b/common/m2/repository/org/sonatype/forge/forge-parent/4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/sonatype/forge/forge-parent/5/BUILD b/common/m2/repository/org/sonatype/forge/forge-parent/5/BUILD
index 2778e3c..d245685 100644
--- a/common/m2/repository/org/sonatype/forge/forge-parent/5/BUILD
+++ b/common/m2/repository/org/sonatype/forge/forge-parent/5/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/sonatype/forge/forge-parent/6/BUILD b/common/m2/repository/org/sonatype/forge/forge-parent/6/BUILD
index 2bf0982..430da1a 100644
--- a/common/m2/repository/org/sonatype/forge/forge-parent/6/BUILD
+++ b/common/m2/repository/org/sonatype/forge/forge-parent/6/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/sonatype/gossip/gossip/1.3/BUILD b/common/m2/repository/org/sonatype/gossip/gossip/1.3/BUILD
index 277fa94..f955c20 100644
--- a/common/m2/repository/org/sonatype/gossip/gossip/1.3/BUILD
+++ b/common/m2/repository/org/sonatype/gossip/gossip/1.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/sonatype/gshell/gshell-io/2.4/BUILD b/common/m2/repository/org/sonatype/gshell/gshell-io/2.4/BUILD
index 5ef5eba..901ed95 100644
--- a/common/m2/repository/org/sonatype/gshell/gshell-io/2.4/BUILD
+++ b/common/m2/repository/org/sonatype/gshell/gshell-io/2.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/sonatype/gshell/gshell/2.4/BUILD b/common/m2/repository/org/sonatype/gshell/gshell/2.4/BUILD
index 3225ae2..c993d2c 100644
--- a/common/m2/repository/org/sonatype/gshell/gshell/2.4/BUILD
+++ b/common/m2/repository/org/sonatype/gshell/gshell/2.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/sonatype/oss/oss-parent/3/BUILD b/common/m2/repository/org/sonatype/oss/oss-parent/3/BUILD
index 77c97d7..4d4a1a9 100644
--- a/common/m2/repository/org/sonatype/oss/oss-parent/3/BUILD
+++ b/common/m2/repository/org/sonatype/oss/oss-parent/3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/sonatype/oss/oss-parent/4/BUILD b/common/m2/repository/org/sonatype/oss/oss-parent/4/BUILD
index af03892..1e8c2f5 100644
--- a/common/m2/repository/org/sonatype/oss/oss-parent/4/BUILD
+++ b/common/m2/repository/org/sonatype/oss/oss-parent/4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/sonatype/oss/oss-parent/7/BUILD b/common/m2/repository/org/sonatype/oss/oss-parent/7/BUILD
index 807c63f..6b983f3 100644
--- a/common/m2/repository/org/sonatype/oss/oss-parent/7/BUILD
+++ b/common/m2/repository/org/sonatype/oss/oss-parent/7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/sonatype/oss/oss-parent/9/BUILD b/common/m2/repository/org/sonatype/oss/oss-parent/9/BUILD
index ddec624..d073592 100644
--- a/common/m2/repository/org/sonatype/oss/oss-parent/9/BUILD
+++ b/common/m2/repository/org/sonatype/oss/oss-parent/9/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/sonatype/plexus/plexus-cipher/1.4/BUILD b/common/m2/repository/org/sonatype/plexus/plexus-cipher/1.4/BUILD
index 53c3c4b..e4042e5 100644
--- a/common/m2/repository/org/sonatype/plexus/plexus-cipher/1.4/BUILD
+++ b/common/m2/repository/org/sonatype/plexus/plexus-cipher/1.4/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/sonatype/plexus/plexus-sec-dispatcher/1.3/BUILD b/common/m2/repository/org/sonatype/plexus/plexus-sec-dispatcher/1.3/BUILD
index f1410ff..9f2f0db 100644
--- a/common/m2/repository/org/sonatype/plexus/plexus-sec-dispatcher/1.3/BUILD
+++ b/common/m2/repository/org/sonatype/plexus/plexus-sec-dispatcher/1.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/sonatype/sisu/inject/guice-bean/1.4.2/BUILD b/common/m2/repository/org/sonatype/sisu/inject/guice-bean/1.4.2/BUILD
index 7324001..559a519 100644
--- a/common/m2/repository/org/sonatype/sisu/inject/guice-bean/1.4.2/BUILD
+++ b/common/m2/repository/org/sonatype/sisu/inject/guice-bean/1.4.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/sonatype/sisu/inject/guice-parent/3.1.0/BUILD b/common/m2/repository/org/sonatype/sisu/inject/guice-parent/3.1.0/BUILD
index e14303a..4e655d7 100644
--- a/common/m2/repository/org/sonatype/sisu/inject/guice-parent/3.1.0/BUILD
+++ b/common/m2/repository/org/sonatype/sisu/inject/guice-parent/3.1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/sonatype/sisu/inject/guice-plexus/1.4.2/BUILD b/common/m2/repository/org/sonatype/sisu/inject/guice-plexus/1.4.2/BUILD
index 8c98805..22f793c 100644
--- a/common/m2/repository/org/sonatype/sisu/inject/guice-plexus/1.4.2/BUILD
+++ b/common/m2/repository/org/sonatype/sisu/inject/guice-plexus/1.4.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/sonatype/sisu/sisu-guice/2.1.7/BUILD b/common/m2/repository/org/sonatype/sisu/sisu-guice/2.1.7/BUILD
index 314e47b..314fdf7 100644
--- a/common/m2/repository/org/sonatype/sisu/sisu-guice/2.1.7/BUILD
+++ b/common/m2/repository/org/sonatype/sisu/sisu-guice/2.1.7/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/sonatype/sisu/sisu-guice/3.1.0/BUILD b/common/m2/repository/org/sonatype/sisu/sisu-guice/3.1.0/BUILD
index c7a3ccb..e169285 100644
--- a/common/m2/repository/org/sonatype/sisu/sisu-guice/3.1.0/BUILD
+++ b/common/m2/repository/org/sonatype/sisu/sisu-guice/3.1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/sonatype/sisu/sisu-inject-bean/1.4.2/BUILD b/common/m2/repository/org/sonatype/sisu/sisu-inject-bean/1.4.2/BUILD
index 1266185..544b91b 100644
--- a/common/m2/repository/org/sonatype/sisu/sisu-inject-bean/1.4.2/BUILD
+++ b/common/m2/repository/org/sonatype/sisu/sisu-inject-bean/1.4.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/sonatype/sisu/sisu-inject-plexus/1.4.2/BUILD b/common/m2/repository/org/sonatype/sisu/sisu-inject-plexus/1.4.2/BUILD
index 723ed0a..15c455d 100644
--- a/common/m2/repository/org/sonatype/sisu/sisu-inject-plexus/1.4.2/BUILD
+++ b/common/m2/repository/org/sonatype/sisu/sisu-inject-plexus/1.4.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/sonatype/sisu/sisu-inject/1.4.2/BUILD b/common/m2/repository/org/sonatype/sisu/sisu-inject/1.4.2/BUILD
index cc948c6..e496d27 100644
--- a/common/m2/repository/org/sonatype/sisu/sisu-inject/1.4.2/BUILD
+++ b/common/m2/repository/org/sonatype/sisu/sisu-inject/1.4.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/sonatype/sisu/sisu-parent/1.4.2/BUILD b/common/m2/repository/org/sonatype/sisu/sisu-parent/1.4.2/BUILD
index b4727f9..be4747a 100644
--- a/common/m2/repository/org/sonatype/sisu/sisu-parent/1.4.2/BUILD
+++ b/common/m2/repository/org/sonatype/sisu/sisu-parent/1.4.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/sonatype/spice/spice-parent/12/BUILD b/common/m2/repository/org/sonatype/spice/spice-parent/12/BUILD
index c456b05..301b2d6 100644
--- a/common/m2/repository/org/sonatype/spice/spice-parent/12/BUILD
+++ b/common/m2/repository/org/sonatype/spice/spice-parent/12/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/sonatype/spice/spice-parent/16/BUILD b/common/m2/repository/org/sonatype/spice/spice-parent/16/BUILD
index 5bea818..d850d88 100644
--- a/common/m2/repository/org/sonatype/spice/spice-parent/16/BUILD
+++ b/common/m2/repository/org/sonatype/spice/spice-parent/16/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/sonatype/spice/spice-parent/17/BUILD b/common/m2/repository/org/sonatype/spice/spice-parent/17/BUILD
index 86454a1..217b892 100644
--- a/common/m2/repository/org/sonatype/spice/spice-parent/17/BUILD
+++ b/common/m2/repository/org/sonatype/spice/spice-parent/17/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/testng/testng/6.9.10/BUILD b/common/m2/repository/org/testng/testng/6.9.10/BUILD
index f6ef35b..ea9b797 100644
--- a/common/m2/repository/org/testng/testng/6.9.10/BUILD
+++ b/common/m2/repository/org/testng/testng/6.9.10/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/twdata/maven/mojo-executor-parent/2.2.0/BUILD b/common/m2/repository/org/twdata/maven/mojo-executor-parent/2.2.0/BUILD
index a4a3d50..901ba27 100644
--- a/common/m2/repository/org/twdata/maven/mojo-executor-parent/2.2.0/BUILD
+++ b/common/m2/repository/org/twdata/maven/mojo-executor-parent/2.2.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/org/twdata/maven/mojo-executor/2.2.0/BUILD b/common/m2/repository/org/twdata/maven/mojo-executor/2.2.0/BUILD
index 26e443f..1c5d118 100644
--- a/common/m2/repository/org/twdata/maven/mojo-executor/2.2.0/BUILD
+++ b/common/m2/repository/org/twdata/maven/mojo-executor/2.2.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/org/w3c/css/sac/1.3/BUILD b/common/m2/repository/org/w3c/css/sac/1.3/BUILD
index 9fa6966..82a2ebb 100644
--- a/common/m2/repository/org/w3c/css/sac/1.3/BUILD
+++ b/common/m2/repository/org/w3c/css/sac/1.3/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/oro/oro/2.0.8/BUILD b/common/m2/repository/oro/oro/2.0.8/BUILD
index 66a5d8a..a83c6a8 100644
--- a/common/m2/repository/oro/oro/2.0.8/BUILD
+++ b/common/m2/repository/oro/oro/2.0.8/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/relaxngDatatype/relaxngDatatype/20020414/BUILD b/common/m2/repository/relaxngDatatype/relaxngDatatype/20020414/BUILD
index e695cdd..f5b5a95 100644
--- a/common/m2/repository/relaxngDatatype/relaxngDatatype/20020414/BUILD
+++ b/common/m2/repository/relaxngDatatype/relaxngDatatype/20020414/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/xalan/serializer/2.7.1/BUILD b/common/m2/repository/xalan/serializer/2.7.1/BUILD
index 7af01d6..0bed5b1 100644
--- a/common/m2/repository/xalan/serializer/2.7.1/BUILD
+++ b/common/m2/repository/xalan/serializer/2.7.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/xalan/xalan/2.6.0/BUILD b/common/m2/repository/xalan/xalan/2.6.0/BUILD
index dd5103c..d71925d 100644
--- a/common/m2/repository/xalan/xalan/2.6.0/BUILD
+++ b/common/m2/repository/xalan/xalan/2.6.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/xalan/xalan/2.7.1/BUILD b/common/m2/repository/xalan/xalan/2.7.1/BUILD
index 79b01af..8f29b97 100644
--- a/common/m2/repository/xalan/xalan/2.7.1/BUILD
+++ b/common/m2/repository/xalan/xalan/2.7.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/xerces/xercesImpl/2.11.0/BUILD b/common/m2/repository/xerces/xercesImpl/2.11.0/BUILD
index 18655f1..bb26917 100644
--- a/common/m2/repository/xerces/xercesImpl/2.11.0/BUILD
+++ b/common/m2/repository/xerces/xercesImpl/2.11.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/xerces/xercesImpl/2.6.2/BUILD b/common/m2/repository/xerces/xercesImpl/2.6.2/BUILD
index cd4a8f2..33caf8a 100644
--- a/common/m2/repository/xerces/xercesImpl/2.6.2/BUILD
+++ b/common/m2/repository/xerces/xercesImpl/2.6.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/xerces/xercesImpl/2.9.1/BUILD b/common/m2/repository/xerces/xercesImpl/2.9.1/BUILD
index ba64dbf..91fe910 100644
--- a/common/m2/repository/xerces/xercesImpl/2.9.1/BUILD
+++ b/common/m2/repository/xerces/xercesImpl/2.9.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/xerces/xmlParserAPIs/2.6.2/BUILD b/common/m2/repository/xerces/xmlParserAPIs/2.6.2/BUILD
index bd510ef..966db16 100644
--- a/common/m2/repository/xerces/xmlParserAPIs/2.6.2/BUILD
+++ b/common/m2/repository/xerces/xmlParserAPIs/2.6.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/xhtmlrenderer/xhtmlrenderer/R8rc1/BUILD b/common/m2/repository/xhtmlrenderer/xhtmlrenderer/R8rc1/BUILD
index ad0a821..0a0b489 100644
--- a/common/m2/repository/xhtmlrenderer/xhtmlrenderer/R8rc1/BUILD
+++ b/common/m2/repository/xhtmlrenderer/xhtmlrenderer/R8rc1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/xml-apis/xml-apis/1.0.b2/BUILD b/common/m2/repository/xml-apis/xml-apis/1.0.b2/BUILD
index 3b4b074..e58fa07 100644
--- a/common/m2/repository/xml-apis/xml-apis/1.0.b2/BUILD
+++ b/common/m2/repository/xml-apis/xml-apis/1.0.b2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/xml-apis/xml-apis/1.3.04/BUILD b/common/m2/repository/xml-apis/xml-apis/1.3.04/BUILD
index 0ba5e32..c11b7d5 100644
--- a/common/m2/repository/xml-apis/xml-apis/1.3.04/BUILD
+++ b/common/m2/repository/xml-apis/xml-apis/1.3.04/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/xml-apis/xml-apis/1.4.01/BUILD b/common/m2/repository/xml-apis/xml-apis/1.4.01/BUILD
index 8b49d61..8750f5c 100644
--- a/common/m2/repository/xml-apis/xml-apis/1.4.01/BUILD
+++ b/common/m2/repository/xml-apis/xml-apis/1.4.01/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/xml-apis/xml-apis/2.0.2/BUILD b/common/m2/repository/xml-apis/xml-apis/2.0.2/BUILD
index 00e9dcc..313e943 100644
--- a/common/m2/repository/xml-apis/xml-apis/2.0.2/BUILD
+++ b/common/m2/repository/xml-apis/xml-apis/2.0.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_pom(
name = "pom",
diff --git a/common/m2/repository/xml-resolver/xml-resolver/1.2/BUILD b/common/m2/repository/xml-resolver/xml-resolver/1.2/BUILD
index ca45965..bde01ce 100644
--- a/common/m2/repository/xml-resolver/xml-resolver/1.2/BUILD
+++ b/common/m2/repository/xml-resolver/xml-resolver/1.2/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/xmlpull/xmlpull/1.1.3.1/BUILD b/common/m2/repository/xmlpull/xmlpull/1.1.3.1/BUILD
index afe0f46..c21156b 100644
--- a/common/m2/repository/xmlpull/xmlpull/1.1.3.1/BUILD
+++ b/common/m2/repository/xmlpull/xmlpull/1.1.3.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/xom/xom/1.0/BUILD b/common/m2/repository/xom/xom/1.0/BUILD
index dbbf7d7..1da9c65 100644
--- a/common/m2/repository/xom/xom/1.0/BUILD
+++ b/common/m2/repository/xom/xom/1.0/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/xpp3/xpp3/1.1.4c/BUILD b/common/m2/repository/xpp3/xpp3/1.1.4c/BUILD
index 552b0ae..c57bd0e 100644
--- a/common/m2/repository/xpp3/xpp3/1.1.4c/BUILD
+++ b/common/m2/repository/xpp3/xpp3/1.1.4c/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/xpp3/xpp3_min/1.1.4c/BUILD b/common/m2/repository/xpp3/xpp3_min/1.1.4c/BUILD
index 2b835d2..9d150d6 100644
--- a/common/m2/repository/xpp3/xpp3_min/1.1.4c/BUILD
+++ b/common/m2/repository/xpp3/xpp3_min/1.1.4c/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",
diff --git a/common/m2/repository/xslthl/xslthl/2.0.1/BUILD b/common/m2/repository/xslthl/xslthl/2.0.1/BUILD
index 94e27fc..2c13c36 100644
--- a/common/m2/repository/xslthl/xslthl/2.0.1/BUILD
+++ b/common/m2/repository/xslthl/xslthl/2.0.1/BUILD
@@ -1,5 +1,5 @@
# This BUILD file was generated by //tools/base/bazel:java_import_generator, please do not edit.
-load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom")
+load("//tools/base/bazel:maven.bzl", "maven_java_import", "maven_pom", "maven_aar")
maven_java_import(
name = "jar",