Merge branch 'master' into removendk-2

* master: (39 commits)
  Fix resolution of Android/AAR artifacts with Gradle resolver (bazel-contrib#1395)
  fail_if_repin_required is now True by default and minor improvement to failure message (bazel-contrib#1397)
  Housekeeping before we release 6.8 (bazel-contrib#1384)
  Add dll, dylib and so types to maven package mappings (bazel-contrib#1392)
  [bzlmod] Allow suppressing warning about multiple contributing modules. (bazel-contrib#1393)
  Use the artifact default values when adding them to a struct and add tests for coursier artifacts that have empty versions provided by BOMs and don't inlcude them in outdated (bazel-contrib#1390)
  Allow package exclusions and inclusions in javadocs (bazel-contrib#1293)
  Document well-known issues with `bzlmod` (bazel-contrib#1388)
  Begin documenting the gradle resolver (bazel-contrib#1389)
  Run gradle regression tests in CI (bazel-contrib#1385)
  Modify maven_export to allow exporting zip archives (bazel-contrib#1368)
  Allow root module's override tags to take precedence over the overridees from transitive deps. (bazel-contrib#1381)
  Ensure root module artifacts and boms take precedence with warnings (bazel-contrib#1373)
  Update maven-metadata.xml when publishing locally (bazel-contrib#1369)
  Add support for gradle resolver (bazel-contrib#1357)
  Prepare for 6.8 release (bazel-contrib#1380)
  Remove the Windows `kt_jvm_export` example (bazel-contrib#1383)
  Avoid spurious warnings about poorly formatted artifact coordinates (bazel-contrib#1374)
  Flip `fail_if_repin_required` to `True` by default (bazel-contrib#1371)
  Allow the same coordinate to be overridden in different repos (bazel-contrib#1378)
  ...

Author: shs96c

.bazelci/examples.yml

@@ -1,45 +1,23 @@
 ---
 tasks:
-  simple-linux:
-    name: "Simple example"
-    platform: ubuntu1804
-    working_directory: examples/simple
-    shell_command: 
-      - "bazel run @maven//:pin"
-    build_targets:
-      - "//..."
-  simple-macos:
-    name: "Simple example"
-    platform: macos
-    working_directory: examples/simple
-    shell_command: 
-      - "bazel run @maven//:pin"
-    build_targets:
-      - "//..."
-  simple-windows:
-    name: "Simple example"
-    platform: windows
-    working_directory: examples/simple
-    build_targets:
-      - "//..."
-  pom-file-generation-linux:
-    name: "POM file generation example"
+  android-kotlin-linux:
+    name: "Android Kotlin example"
     platform: ubuntu1804
-    working_directory: examples/pom_file_generation
+    working_directory: examples/android_kotlin_app
     build_targets:
-      - "//..."
-  pom-file-generation-macos:
-    name: "POM file generation example"
+    - "//:app"
+  android-kotlin-macos:
+    name: "Android Kotlin example"
     platform: macos
-    working_directory: examples/pom_file_generation
+    working_directory: examples/android_kotlin_app
     build_targets:
-      - "//..."
-  pom-file-generation-windows:
-    name: "POM file generation example"
+    - "//:app"
+  android-kotlin-windows:
+    name: "Android Kotlin example"
     platform: windows
-    working_directory: examples/pom_file_generation
+    working_directory: examples/android_kotlin_app
     build_targets:
-      - "//..."
+    - "//:app"
   android-local-test-linux:
     name: "Android Robolectric test example"
     platform: ubuntu1804
@@ -58,6 +36,42 @@ tasks:
     working_directory: examples/android_local_test
     build_targets:
       - "//..."
+  bzlmod-linux:
+    name: "bzlmod example"
+    platform: ubuntu1804
+    working_directory: examples/bzlmod
+    build_targets:
+      - "//..."
+  bzlmod-macos:
+    name: "bzlmod example"
+    platform: macos
+    working_directory: examples/bzlmod
+    build_targets:
+      - "//..."
+  bzlmod-windows:
+    name: "bzlmod example"
+    platform: windows
+    working_directory: examples/bzlmod
+    build_targets:
+      - "//..."
+  java-export-linux:
+    name: "java-export example"
+    platform: ubuntu1804
+    working_directory: examples/java-export
+    build_targets:
+      - "//..."
+  java-export-macos:
+    name: "java-export example"
+    platform: macos
+    working_directory: examples/java-export
+    build_targets:
+      - "//..."
+  java-export-windows:
+    name: "java-export example"
+    platform: windows
+    working_directory: examples/java-export
+    build_targets:
+      - "//..."
   kotlin-android-local-test-linux:
     name: "Kotlin Android Robolectric test example"
     platform: ubuntu1804
@@ -76,48 +90,64 @@ tasks:
     working_directory: examples/kt_android_local_test
     build_targets:
       - "//..."
-  android-kotlin-linux:
-    name: "Android Kotlin example"
+  kotlin-jvm-export-linux:
+    name: "kt_jvm_export example"
     platform: ubuntu1804
-    working_directory: examples/android_kotlin_app
+    working_directory: examples/kt_jvm_export
     build_targets:
-    - "//:app"
-  android-kotlin-macos:
-    name: "Android Kotlin example"
+      - "//..."
+  kotlin-jvm-export-macos:
+    name: "kt_jvm_export example"
     platform: macos
-    working_directory: examples/android_kotlin_app
-    build_targets:
-    - "//:app"
-  android-kotlin-windows:
-    name: "Android Kotlin example"
-    platform: windows
-    working_directory: examples/android_kotlin_app
+    working_directory: examples/kt_jvm_export
     build_targets:
-    - "//:app"
-  spring-boot-linux:
-    name: "Spring boot example"
+      - "//..."
+# Ignored because none of the rje team have access to a Windows
+# machine to properly investigate the issue
+#  kotlin-jvm-export-windows:
+#    name: "kt_jvm_export example"
+#    platform: windows
+#    working_directory: examples/kt_jvm_export
+#    build_targets:
+#      - "//..."
+  pom-file-generation-linux:
+    name: "POM file generation example"
     platform: ubuntu1804
-    working_directory: examples/spring_boot
+    working_directory: examples/pom_file_generation
     build_targets:
-    - "//..."
-    test_targets:
-    - "//..."
-  spring-boot-macos:
-    name: "Spring boot example"
+      - "//..."
+  pom-file-generation-macos:
+    name: "POM file generation example"
     platform: macos
-    working_directory: examples/spring_boot
+    working_directory: examples/pom_file_generation
     build_targets:
-    - "//..."
-    test_targets:
-    - "//..."
-  spring-boot-windows:
-    name: "Spring boot example"
+      - "//..."
+  pom-file-generation-windows:
+    name: "POM file generation example"
     platform: windows
-    working_directory: examples/spring_boot
+    working_directory: examples/pom_file_generation
     build_targets:
-    - "//..."
+      - "//..."
+  protobuf-java-linux:
+    name: "Protobuf Java example"
+    platform: ubuntu1804
+    working_directory: examples/protobuf-java
     test_targets:
-    - "//..."
+      - "//..."
+  protobuf-java-macos:
+    name: "Protobuf Java example"
+    platform: macos
+    working_directory: examples/protobuf-java
+    test_targets:
+      - "//..."
+  protobuf-java-windows:
+    name: "Protobuf Java example"
+    platform: windows 
+    working_directory: examples/protobuf-java
+    # //src/test:diff_json_test / diff_test does not ignore line endings
+    # correctly on Windows.
+    build_targets:
+      - "//..."
   scala-akka-linux:
     name: "Scala example"
     platform: ubuntu1804
@@ -143,41 +173,49 @@ tasks:
     # test_targets:
     # https://github.com/bazelbuild/rules_jvm_external/issues/103
     # - "//..."
-  protobuf-java-linux:
-    name: "Protobuf Java example"
+  simple-linux:
+    name: "Simple example"
     platform: ubuntu1804
-    working_directory: examples/protobuf-java
-    test_targets:
+    working_directory: examples/simple
+    shell_command: 
+      - "bazel run @maven//:pin"
+    build_targets:
       - "//..."
-  protobuf-java-macos:
-    name: "Protobuf Java example"
+  simple-macos:
+    name: "Simple example"
     platform: macos
-    working_directory: examples/protobuf-java
-    test_targets:
+    working_directory: examples/simple
+    shell_command: 
+      - "bazel run @maven//:pin"
+    build_targets:
       - "//..."
-  protobuf-java-windows:
-    name: "Protobuf Java example"
-    platform: windows 
-    working_directory: examples/protobuf-java
-    # //src/test:diff_json_test / diff_test does not ignore line endings
-    # correctly on Windows.
+  simple-windows:
+    name: "Simple example"
+    platform: windows
+    working_directory: examples/simple
     build_targets:
       - "//..."
-  bzlmod-linux:
-    name: "bzlmod example"
+  spring-boot-linux:
+    name: "Spring boot example"
     platform: ubuntu1804
-    working_directory: examples/bzlmod
+    working_directory: examples/spring_boot
     build_targets:
-      - "//..."
-  bzlmod-macos:
-    name: "bzlmod example"
+    - "//..."
+    test_targets:
+    - "//..."
+  spring-boot-macos:
+    name: "Spring boot example"
     platform: macos
-    working_directory: examples/bzlmod
+    working_directory: examples/spring_boot
     build_targets:
-      - "//..."
-  bzlmod-windows:
-    name: "bzlmod example"
+    - "//..."
+    test_targets:
+    - "//..."
+  spring-boot-windows:
+    name: "Spring boot example"
     platform: windows
-    working_directory: examples/bzlmod
+    working_directory: examples/spring_boot
     build_targets:
-      - "//..."
+    - "//..."
+    test_targets:
+    - "//..."

.bazelci/presubmit.yml

@@ -8,8 +8,10 @@ tasks:
       REPIN: 1
     shell_commands:
       - bazel run @regression_testing_coursier//:pin
+      - bazel run @regression_testing_gradle//:pin
       - bazel run @regression_testing_maven//:pin
       - bazel run @maven_install_in_custom_location//:pin
+      - bazel run @same_override_target//:pin
       - tests/bazel_run_tests.sh
     test_targets:
       - "--"
@@ -21,8 +23,10 @@ tasks:
       REPIN: 1
     shell_commands:
       - bazel run @regression_testing_coursier//:pin
+      - bazel run @regression_testing_gradle//:pin
       - bazel run @regression_testing_maven//:pin
       - bazel run @maven_install_in_custom_location//:pin
+      - bazel run @same_override_target//:pin
       - tests/bazel_run_tests.sh
     test_targets:
       - "--"
@@ -34,24 +38,29 @@ tasks:
       REPIN: 1
     shell_commands:
       - bazel run @regression_testing_coursier//:pin
+      - bazel run @regression_testing_gradle//:pin
       - bazel run @regression_testing_maven//:pin
       - bazel run @maven_install_in_custom_location//:pin
+      - bazel run @same_override_target//:pin
       - tests/bazel_run_tests.sh
     test_targets:
       - "--"
       - "//..."
   ubuntu2204_latest:
     platform: ubuntu2204
-    bazel: latest
+    # TODO: Revert to latest after fixing incompatibilities with Bazel 8.0.0
+    bazel: 7.x
     environment:
       # This tests custom cache locations.
       # https://github.com/bazelbuild/rules_jvm_external/pull/316
       COURSIER_CACHE: /tmp/custom_coursier_cache
       REPIN: 1
     shell_commands:
       - bazel run @regression_testing_coursier//:pin
+      - bazel run @regression_testing_gradle//:pin
       - bazel run @regression_testing_maven//:pin
       - bazel run @maven_install_in_custom_location//:pin
+      - bazel run @same_override_target//:pin
       - tests/bazel_run_tests.sh
     test_targets:
       - "--"
@@ -64,8 +73,10 @@ tasks:
       REPIN: 1
     shell_commands:
       - bazel run @regression_testing_coursier//:pin
+      - bazel run @regression_testing_gradle//:pin
       - bazel run @regression_testing_maven//:pin
       - bazel run @maven_install_in_custom_location//:pin
+      - bazel run @same_override_target//:pin
       - tests/bazel_run_tests.sh
     test_targets:
       - "//..."
@@ -78,8 +89,10 @@ tasks:
       REPIN: 1
     shell_commands:
       - bazel run @regression_testing_coursier//:pin
+      - bazel run @regression_testing_gradle//:pin
       - bazel run @regression_testing_maven//:pin
       - bazel run @maven_install_in_custom_location//:pin
+      - bazel run @same_override_target//:pin
       - tests/bazel_run_tests.sh
     test_targets:
       - "--"

.bazelrc

@@ -1,3 +1,5 @@
+common --enable_runfiles
+
 build --java_language_version=11
 build --java_runtime_version=remotejdk_11
 

.bazelversion

@@ -1 +1 @@
-7.4.1
+7.5.0