Upgrade Bazel example

Author: filiphr

.bazelignore

@@ -0,0 +1,4 @@
+mapstruct-on-bazel/bazel-bin
+mapstruct-on-bazel/bazel-out
+mapstruct-on-bazel/bazel-testlogs
+mapstruct-on-bazel/bazel-mapstruct-on-bazel

.github/workflows/main.yml

@@ -70,7 +70,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [8, 11, 17, 21]
+        java: [11, 17, 21]
     name: 'Linux JDK ${{ matrix.java }} Bazel'
     runs-on: ubuntu-latest
     steps:
@@ -82,7 +82,7 @@ jobs:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
       - name: Setup Bazel
-        uses: bazel-contrib/setup-bazel@0.8.5
+        uses: bazel-contrib/setup-bazel@0.18.0
         with:
           # Avoid downloading Bazel every time.
           bazelisk-cache: true

BUILD.bazel

@@ -0,0 +1,2 @@
+# Root BUILD file for mapstruct-examples
+# The actual Bazel build is in the mapstruct-on-bazel subdirectory

MODULE.bazel

@@ -0,0 +1,19 @@
+module(
+    name = "mapstruct-examples",
+    version = "1.0.0",
+)
+
+bazel_dep(name = "rules_java", version = "8.14.0")
+bazel_dep(name = "rules_jvm_external", version = "6.6")
+
+maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
+
+maven.install(
+    artifacts = [
+        "org.mapstruct:mapstruct:1.6.3",
+        "org.mapstruct:mapstruct-processor:1.6.3",
+        "junit:junit:4.13.2",
+        "org.assertj:assertj-core:3.27.7",
+    ],
+)
+use_repo(maven, "maven")

MODULE.bazel.lock

@@ -1,28 +1,2 @@
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-RULES_JVM_EXTERNAL_TAG = "3.3"
-
-RULES_JVM_EXTERNAL_SHA = "d85951a92c0908c80bd8551002d66cb23c3434409c814179c0ff026b53544dab"
-
-http_archive(
-    name = "rules_jvm_external",
-    sha256 = RULES_JVM_EXTERNAL_SHA,
-    strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG,
-)
-
-load("@rules_jvm_external//:defs.bzl", "maven_install")
-
-maven_install(
-    artifacts = [
-        "junit:junit:4.13.1",
-        "org.easytesting:fest-assert:1.4",
-        "org.mapstruct:mapstruct:1.3.1.Final",
-        "org.mapstruct:mapstruct-processor:1.3.1.Final",
-    ],
-    repositories = [
-        "https://jcenter.bintray.com/",
-        "https://maven.google.com",
-        "https://repo1.maven.org/maven2",
-    ],
-)
+# This project has been migrated to Bzlmod (MODULE.bazel)
+# The WORKSPACE file is kept for compatibility but is no longer actively used

WORKSPACE

@@ -1 +1 @@
-1.1.0
+8.5.1

mapstruct-on-bazel/.bazelversion

@@ -3,7 +3,7 @@ load("@rules_java//java:defs.bzl", "java_library", "java_plugin", "java_test")
 java_library(
     name = "mapstruct-on-bazel",
     srcs = glob(["src/main/java/**/*.java"]),
-    resources = glob(["src/main/resources/**"]),
+    resources = glob(["src/main/resources/**"], allow_empty = True),
     deps = [
         ":mapstruct",
     ],
@@ -12,11 +12,11 @@ java_library(
 java_library(
     name = "tests",
     srcs = glob(["src/test/java/**/*.java"]),
-    resources = glob(["src/test/resources/**"]),
+    resources = glob(["src/test/resources/**"], allow_empty = True),
     deps = [
         ":mapstruct-on-bazel",
         "@maven//:junit_junit",
-        "@maven//:org_easytesting_fest_assert",
+        "@maven//:org_assertj_assertj_core",
     ],
 )
 
@@ -33,15 +33,9 @@ java_library(
     exported_plugins = [
         ":mapstruct_plugin",
     ],
-    neverlink = True,
     visibility = ["//visibility:public"],
     exports = [
         "@maven//:org_mapstruct_mapstruct",
-        "@maven//:org_mapstruct_mapstruct_processor",
-    ],
-    runtime_deps = [
-        # add to runtime, as we need
-        "@maven//:org_mapstruct_mapstruct",
     ],
 )
 

mapstruct-on-bazel/BUILD.bazel

@@ -0,0 +1,19 @@
+module(
+    name = "mapstruct-on-bazel",
+    version = "1.0.0",
+)
+
+bazel_dep(name = "rules_java", version = "8.14.0")
+
+maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
+bazel_dep(name = "rules_jvm_external", version = "6.6")
+
+maven.install(
+    artifacts = [
+        "org.mapstruct:mapstruct:1.6.3",
+        "org.mapstruct:mapstruct-processor:1.6.3",
+        "junit:junit:4.13.2",
+        "org.assertj:assertj-core:3.27.7",
+    ],
+)
+use_repo(maven, "maven")