Add Java bzlmod tests to CI

Author: bartoszkosiorek

.github/workflows/ci.yaml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: bazel-contrib/setup-bazel@0.15.0
 
-      - name: bazel build
+      - name: sonar canner build
         run: |
           bazel build //:sonar_scanner
           bazel build //:sonarqube_coverage_generator
@@ -30,24 +30,24 @@ jobs:
       #   run: |
       #     bazel aquery ...
 
-  test-workspace:
+  test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         folder:
           - examples/java-workspace
-          # - examples/java-bzlmod
+          - examples/java-bzlmod
     steps:
       - uses: actions/checkout@v5
       - uses: bazel-contrib/setup-bazel@0.15.0
 
-      - name: bazel test coverage
+      - name: test coverage
         working-directory: ${{ matrix.folder }}
         run: |
           bazel coverage //...
           bazel build //:sonarqube
 
-      - name: bazel sonarqube report
+      - name: sonarqube report
         working-directory: ${{ matrix.folder }}
         # TODO We don't have sonar server to send scan results
         continue-on-error: True

MODULE.bazel

@@ -1,6 +1,6 @@
 module(
     name = "bazel_sonarqube",
-    version = "1.0.3",
+    version = "1.0.5",
     compatibility_level = 1,
     repo_name = "bazel_sonarqube",
 )

examples/java-bzlmod/.bazelrc

@@ -0,0 +1,3 @@
+coverage --collect_code_coverage
+coverage --combined_report=lcov
+coverage --coverage_report_generator=@bazel_sonarqube//:sonarqube_coverage_generator

examples/java-bzlmod/.bazelversion

@@ -0,0 +1 @@
+7.6.1

examples/java-bzlmod/BUILD

@@ -0,0 +1,38 @@
+filegroup(
+    name = "git",
+    srcs = glob(
+        [".git/**"],
+        exclude = [".git/**/*[*"],  # gitk creates temp files with []
+    ),
+    tags = ["manual"],
+)
+
+filegroup(
+    name = "coverage_report",
+    srcs = ["bazel-out/_coverage/_coverage_report.dat"],  # Created manually
+    tags = ["manual"],
+)
+
+filegroup(
+    name = "test_reports",
+    srcs = glob(["bazel-testlogs/**/test.xml"]),  # Created manually
+    tags = ["manual"],
+    visibility = ["//visibility:public"],
+)
+
+load("@bazel_sonarqube//:defs.bzl", "sonarqube")
+
+sonarqube(
+    name = "sonarqube",
+    srcs = [],
+    coverage_report = ":coverage_report",
+    modules = {
+        "//subproject:sq_subproject": "subproject",
+    },
+    project_key = "com.example.project:project",
+    project_name = "My Project",
+    scm_info = [":git"],
+    tags = ["manual"],
+    targets = [],
+    testonly = True,
+)

examples/java-bzlmod/MODULE.bazel

@@ -0,0 +1,21 @@
+###############################################################################
+# Bazel now uses Bzlmod by default to manage external dependencies.
+# Please consider migrating your external dependencies from WORKSPACE to MODULE.bazel.
+#
+# For more details, please check https://github.com/bazelbuild/bazel/issues/18958
+###############################################################################
+
+bazel_dep(name = "bazel_sonarqube", version = "1.0.3", dev_dependency = True)
+non_module_dependencies = use_extension("@bazel_sonarqube//:extensions.bzl", "non_module_dependencies")
+# TODO This needs to be uncommented after 1.0.5 release
+# non_module_dependencies.settings(
+#     sonar_scanner_cli_version = "7.2.0.5079",
+#     sonar_scanner_cli_sha256 = "30d80b37c8f4be1254b6c43ec8c64291798d97a710c28475958b5e2f10809fe1",
+# )
+use_repo(non_module_dependencies, "org_sonarsource_scanner_cli_sonar_scanner_cli")
+
+bazel_dep(name = "rules_jvm_external", version = "6.8")
+
+maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
+
+use_repo(maven, "maven")

examples/java-bzlmod/MODULE.bazel.lock

@@ -0,0 +1,27 @@
+load("@bazel_sonarqube//:defs.bzl", "sonarqube")
+
+sonarqube(
+    name = "sonarqube",
+    srcs = [
+        "//subproject-with-separate-sonarqube/src/main/java/com/separate:srcs",
+    ],
+    targets = [
+        "//subproject-with-separate-sonarqube/src/main/java/com/separate",
+    ],
+    test_reports = [ "//:test_reports" ],
+    test_srcs = [ 
+        "//subproject-with-separate-sonarqube/src/test/java/com/separate:srcs", 
+    ],
+    test_targets = [ 
+        "//subproject-with-separate-sonarqube/src/test/java/com/separate:SeparateAppTest", 
+    ],
+    modules = {
+        "//subproject-with-separate-sonarqube/subsubproject:sq_project": "subproject-with-separate-sonarqube/subsubproject",
+    },
+    coverage_report = "//:coverage_report",
+    project_key = "com.example.separate:separate",
+    project_name = "My Project with Separate sonarqube rule",
+    scm_info = ["//:git"],
+    tags = ["manual"],
+    testonly = True,
+)

examples/java-bzlmod/subproject-with-separate-sonarqube/BUILD

@@ -0,0 +1,11 @@
+filegroup(
+    name = "srcs",
+    srcs = glob(["*.java"]),
+    visibility = [ "//visibility:public" ],
+)
+
+java_library(
+    name = "separate",
+    srcs = [":srcs"],
+    visibility = [ "//visibility:public" ],
+)

examples/java-bzlmod/subproject-with-separate-sonarqube/src/main/java/com/separate/BUILD

@@ -0,0 +1,13 @@
+package com.separate;
+
+public class SeparateApp {
+    private final String message;
+
+    public SeparateApp() {
+        this.message = "Hello from another (separate) world.";
+    }
+
+    public String getMessage() {
+        return this.message;
+    }
+}