[bazel] Use java_export for things we export to maven

SeleniumHQ · Aug 3, 2019 · 5f7462f · 5f7462f
1 parent 6e18a27
commit 5f7462f
Show file tree

Hide file tree

Showing 14 changed files with 49 additions and 52 deletions.
diff --git a/java/client/src/org/openqa/selenium/chrome/BUILD.bazel b/java/client/src/org/openqa/selenium/chrome/BUILD.bazel
@@ -1,11 +1,11 @@
+load("//java:maven.bzl", "java_export")
 load("//java:version.bzl", "SE_VERSION")
 
-java_library(
+java_export(
     name = "chrome",
     srcs = glob(["*.java"]),
-    tags = [
-        "maven_coordinates=org.seleniumhq.selenium:selenium-chrome-driver:%s" % SE_VERSION,
-    ],
+    maven_coordinates = "org.seleniumhq.selenium:selenium-chrome-driver:%s" % SE_VERSION,
+    pom_template = "//java/client/src/org/openqa/selenium:template-pom",
     visibility = ["//visibility:public"],
     exports = [
         "//java/client/src/org/openqa/selenium/chromium",

diff --git a/java/client/src/org/openqa/selenium/chromium/BUILD.bazel b/java/client/src/org/openqa/selenium/chromium/BUILD.bazel
@@ -1,11 +1,11 @@
+load("//java:maven.bzl", "java_export")
 load("//java:version.bzl", "SE_VERSION")
 
-java_library(
+java_export(
     name = "chromium",
     srcs = glob(["*.java"]),
-    tags = [
-        "maven_coordinates=org.seleniumhq.selenium:selenium-chromium-driver:%s" % SE_VERSION,
-    ],
+    maven_coordinates = "org.seleniumhq.selenium:selenium-chromium-driver:%s" % SE_VERSION,
+    pom_template = "//java/client/src/org/openqa/selenium:template-pom",
     visibility = [
         "//visibility:public",
     ],

diff --git a/java/client/src/org/openqa/selenium/devtools/BUILD.bazel b/java/client/src/org/openqa/selenium/devtools/BUILD.bazel
@@ -1,11 +1,11 @@
+load("//java:maven.bzl", "java_export")
 load("//java:version.bzl", "SE_VERSION")
 
-java_library(
+java_export(
     name = "devtools",
     srcs = glob(["**/*.java"]),
-    tags = [
-        "maven_coordinates=org.seleniumhq.selenium:selenium-devtools:%s" % SE_VERSION,
-    ],
+    maven_coordinates = "org.seleniumhq.selenium:selenium-devtools:%s" % SE_VERSION,
+    pom_template = "//java/client/src/org/openqa/selenium:template-pom",
     visibility = [
         "//visibility:public",
     ],

diff --git a/java/client/src/org/openqa/selenium/edge/BUILD.bazel b/java/client/src/org/openqa/selenium/edge/BUILD.bazel
@@ -1,3 +1,4 @@
+load("//java:maven.bzl", "java_export")
 load("//java:version.bzl", "SE_VERSION")
 
 java_library(
@@ -12,12 +13,11 @@ java_library(
     ],
 )
 
-java_library(
+java_export(
     name = "edgeium",
     srcs = glob(["*.java"]),
-    tags = [
-        "maven_coordinates=org.seleniumhq.selenium:selenium-edge-driver:%s" % SE_VERSION,
-    ],
+    maven_coordinates = "org.seleniumhq.selenium:selenium-edge-driver:%s" % SE_VERSION,
+    pom_template = "//java/client/src/org/openqa/selenium:template-pom",
     visibility = [
         "//visibility:public",
     ],

diff --git a/java/client/src/org/openqa/selenium/edge/edgehtml/BUILD.bazel b/java/client/src/org/openqa/selenium/edge/edgehtml/BUILD.bazel
@@ -1,11 +1,11 @@
+load("//java:maven.bzl", "java_export")
 load("//java:version.bzl", "SE_VERSION")
 
-java_library(
+java_export(
     name = "edgehtml",
     srcs = glob(["*.java"]),
-    tags = [
-        "maven_coordinates=org.seleniumhq.selenium:selenium-edgehtml-driver:%s" % SE_VERSION,
-    ],
+    maven_coordinates = "org.seleniumhq.selenium:selenium-edgehtml-driver:%s" % SE_VERSION,
+    pom_template = "//java/client/src/org/openqa/selenium:template-pom",
     visibility = [
         "//visibility:public",
     ],

diff --git a/java/client/src/org/openqa/selenium/ie/BUILD.bazel b/java/client/src/org/openqa/selenium/ie/BUILD.bazel
@@ -1,11 +1,11 @@
+load("//java:maven.bzl", "java_export")
 load("//java:version.bzl", "SE_VERSION")
 
-java_library(
+java_export(
     name = "ie",
     srcs = glob(["*.java"]),
-    tags = [
-        "maven_coordinates=org.seleniumhq.selenium:selenium-ie-driver:%s" % SE_VERSION,
-    ],
+    maven_coordinates = "org.seleniumhq.selenium:selenium-ie-driver:%s" % SE_VERSION,
+    pom_template = "//java/client/src/org/openqa/selenium:template-pom",
     visibility = ["//visibility:public"],
     deps = [
         "//java/client/src/org/openqa/selenium:core",

diff --git a/java/client/src/org/openqa/selenium/json/BUILD.bazel b/java/client/src/org/openqa/selenium/json/BUILD.bazel
@@ -1,11 +1,11 @@
+load("//java:maven.bzl", "java_export")
 load("//java:version.bzl", "SE_VERSION")
 
-java_library(
+java_export(
     name = "json",
     srcs = glob(["*.java"]),
-    tags = [
-        "maven_coordinates=org.seleniumhq.selenium:selenium-json:%s" % SE_VERSION,
-    ],
+    maven_coordinates = "org.seleniumhq.selenium:selenium-json:%s" % SE_VERSION,
+    pom_template = "//java/client/src/org/openqa/selenium:template-pom",
     visibility = [
         "//visibility:public",
     ],

diff --git a/java/client/src/org/openqa/selenium/lift/BUILD.bazel b/java/client/src/org/openqa/selenium/lift/BUILD.bazel
@@ -1,11 +1,11 @@
+load("//java:maven.bzl", "java_export")
 load("//java:version.bzl", "SE_VERSION")
 
-java_library(
+java_export(
     name = "lift",
     srcs = glob(["**/*.java"]),
-    tags = [
-        "maven_coordinates=org.seleniumhq.selenium:lift:%s" % SE_VERSION,
-    ],
+    maven_coordinates = "org.seleniumhq.selenium:lift:%s" % SE_VERSION,
+    pom_template = "//java/client/src/org/openqa/selenium:template-pom",
     visibility = [
         "//visibility:public",
     ],

diff --git a/java/client/src/org/openqa/selenium/safari/BUILD.bazel b/java/client/src/org/openqa/selenium/safari/BUILD.bazel
@@ -1,11 +1,11 @@
+load("//java:maven.bzl", "java_export")
 load("//java:version.bzl", "SE_VERSION")
 
-java_library(
+java_export(
     name = "safari",
     srcs = glob(["*.java"]),
-    tags = [
-        "maven_coordinates=org.seleniumhq.selenium:selenium-safari-driver:%s" % SE_VERSION,
-    ],
+    maven_coordinates = "org.seleniumhq.selenium:selenium-safari-driver:%s" % SE_VERSION,
+    pom_template = "//java/client/src/org/openqa/selenium:template-pom",
     visibility = ["//visibility:public"],
     deps = [
         "//java/client/src/org/openqa/selenium:core",

diff --git a/java/client/src/org/openqa/selenium/support/BUILD.bazel b/java/client/src/org/openqa/selenium/support/BUILD.bazel
@@ -1,15 +1,15 @@
+load("//java:maven.bzl", "java_export")
 load("//java:version.bzl", "SE_VERSION")
 
-java_library(
+java_export(
     name = "support",
     srcs = [
         "Color.java",
         "Colors.java",
         "ThreadGuard.java",
     ],
-    tags = [
-        "maven_coordinates=org.seleniumhq.selenium:selenium-support:%s" % SE_VERSION,
-    ],
+    maven_coordinates = "org.seleniumhq.selenium:selenium-support:%s" % SE_VERSION,
+    pom_template = "//java/client/src/org/openqa/selenium:template-pom",
     visibility = ["//visibility:public"],
     exports = [
         ":page-factory",

diff --git a/java/client/src/org/openqa/selenium/tools/MavenPublisher.java b/java/client/src/org/openqa/selenium/tools/MavenPublisher.java
@@ -53,8 +53,6 @@ public class MavenPublisher {
 
   private static final Logger LOG = Logger.getLogger(MavenPublisher.class.getName());
   private static final ExecutorService EXECUTOR = Executors.newSingleThreadExecutor();
-//  private static final ExecutorService EXECUTOR = Executors.newFixedThreadPool(
-//    Runtime.getRuntime().availableProcessors());
 
   public static void main(String[] args) throws IOException, InterruptedException, ExecutionException, TimeoutException {
 

diff --git a/java/private/maven_upload.txt b/java/private/maven_upload.txt
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
 
-echo `pwd`
-
+echo "Uploading {coordinates} to {maven_repo}"
 ./uploader {maven_repo} {gpg_password} {user} {password} {coordinates} pom.xml artifact.jar artifact-source.jar
diff --git a/java/server/src/com/thoughtworks/selenium/webdriven/BUILD.bazel b/java/server/src/com/thoughtworks/selenium/webdriven/BUILD.bazel
@@ -1,11 +1,11 @@
+load("//java:maven.bzl", "java_export")
 load("//java:version.bzl", "SE_VERSION")
 
-java_library(
+java_export(
     name = "webdriven",
     srcs = glob(["*.java"]),
-    tags = [
-        "maven_coordinates=org.seleniumhq.selenium:selenium-leg-rc:%s" % SE_VERSION,
-    ],
+    maven_coordinates = "org.seleniumhq.selenium:selenium-leg-rc:%s" % SE_VERSION,
+    pom_template = "//java/client/src/org/openqa/selenium:template-pom",
     visibility = [
         "//visibility:public",
     ],

diff --git a/java/server/src/org/openqa/selenium/grid/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/BUILD.bazel
@@ -1,11 +1,11 @@
+load("//java:maven.bzl", "java_export")
 load("//java:version.bzl", "SE_VERSION")
 
-java_library(
+java_export(
     name = "grid",
     srcs = glob(["*.java"]),
-    tags = [
-        "maven_coordinates=org.seleniumhq.selenium:selenium-grid:%s" % SE_VERSION,
-    ],
+    maven_coordinates = "org.seleniumhq.selenium:selenium-grid:%s" % SE_VERSION,
+    pom_template = "//java/client/src/org/openqa/selenium:template-pom",
     visibility = [
         "//visibility:public",
     ],