Merge branch 'master' into parallel-tests

.github/dependabot.yaml

@@ -12,14 +12,6 @@ updates:
     ignore:
       - dependency-name: "*"
         update-types: [ "version-update:semver-major" ]
-  - package-ecosystem: maven
-    target-branch: 2.3.x
-    directory: "/"
-    schedule:
-      interval: daily
-    ignore:
-      - dependency-name: "*"
-        update-types: [ "version-update:semver-minor", "version-update:semver-major" ]
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
@@ -28,9 +20,4 @@ updates:
     target-branch: 2.4.x
     directory: "/"
     schedule:
-      interval: daily
-  - package-ecosystem: "github-actions"
-    target-branch: 2.3.x
-    directory: "/"
-    schedule:
-      interval: daily
+      interval: daily

.github/workflows/build.yml

@@ -16,10 +16,27 @@ jobs:
 
   Build:
     uses: evanchooly/workflows/.github/workflows/build.yml@master
+    secrets:
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
     with:
       java: 17
       saveBuild: true
 
+  Critter:
+    uses: evanchooly/workflows/.github/workflows/build.yml@master
+    needs:
+      - Build
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [ 17, 21, 24-ea ]
+    secrets:
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+    with:
+      java: ${{ matrix.java }}
+      maven-flags: "-Pcritter"
+      optional: true
+
   Matrix:
     runs-on: ubuntu-latest
     steps:
@@ -89,6 +106,8 @@ jobs:
         driver: ${{ fromJson(needs.matrix.outputs.driver_latest) }}
         java: [ 17 ]
     uses: evanchooly/workflows/.github/workflows/build.yml@master
+    secrets:
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
     with:
       java: ${{ matrix.java }}
       reuseBuild: true
@@ -111,14 +130,16 @@ jobs:
             java: 21
             mongo: 7
           - driver: ${{ fromJson(needs.matrix.outputs.driver_latest)[0] }}
-            java: 22
+            java: 23-ea
             mongo: 7
-            optional: tre
+            optional: true
           - driver: ${{ needs.matrix.outputs.driver_snapshot }}
             java: 17
             mongo: 7
             optional: true
     uses: evanchooly/workflows/.github/workflows/build.yml@master
+    secrets:
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
     with:
       java: ${{ matrix.java }}
       reuseBuild: true
@@ -138,11 +159,11 @@ jobs:
       java: 17
     secrets:
       GH_PUSH_TOKEN       : ${{ secrets.GH_PUSH_TOKEN }}
-      GPG_PASSPHRASE      : ${{ secrets.GPG_PASSPHRASE }}
+      MAVEN_GPG_PASSPHRASE      : ${{ secrets.MAVEN_GPG_PASSPHRASE }}
       GPG_PUBLIC_KEY      : ${{ secrets.GPG_PUBLIC_KEY }}
       GPG_PRIVATE_KEY     : ${{ secrets.GPG_PRIVATE_KEY }}
       SONATYPE_USERNAME   : ${{ secrets.SONATYPE_USERNAME }}
-      SONATYPE_PASSWORD   : ${{ secrets.SONATYPE_PASSWORD }}
+      SONATYPE_TOKEN   : ${{ secrets.SONATYPE_TOKEN }}
 
   Docs:
     name: Update Documentation

.mvn/develocity.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+
+<!-- Common develocity.xml configuration for Maven shared between CI agents and developers building locally.
+
+     The build cache credentials required for CI builds to write to the remote build cache are read from environment variables.
+     Possibly, the credentials are configured in Jenkins via Credentials plugin (https://plugins.jenkins.io/credentials/) and
+     Credentials Binding plugin (https://plugins.jenkins.io/credentials-binding/), or the credentials are injected using the
+     vendor-specific mechanism of the CI server running the build.
+
+     Note: In the XML configuration below, you need to adjust
+
+             - the server url of your Develocity server
+             - the name of the environment variable that reveals the build is running in a CI environment
+             - the names of the environment variables holding the build cache credentials
+
+           to the specifics of your CI server settings. -->
+
+<develocity
+        xmlns="https://www.gradle.com/develocity-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="https://www.gradle.com/develocity-maven https://www.gradle.com/schema/develocity-maven.xsd">
+    <server>
+        <url>https://develocity.commonhaus.dev</url> <!-- adjust to your Develocity server -->
+        <allowUntrusted>false</allowUntrusted> <!-- ensure a trusted certificate is configured -->
+    </server>
+    <projectId>morphia</projectId>
+    <buildScan>
+        <backgroundBuildScanUpload>#{isFalse(env['CI'])}</backgroundBuildScanUpload> <!-- adjust to your CI provider -->
+        <publishing>
+            <onlyIf><![CDATA[authenticated && isTrue(env['CI'])]]></onlyIf>
+        </publishing>
+        <obfuscation>
+            <ipAddresses>#{{'0.0.0.0'}}</ipAddresses>
+            <username>#{isTrue(env['CI']) ? 'GH actions' : 'Carmen Sandiego'}</username>
+        </obfuscation>
+    </buildScan>
+    <buildCache>
+        <local>
+            <enabled>false</enabled>
+        </local>
+        <remote>
+            <enabled>false</enabled>
+            <storeEnabled>#{isTrue(env['CI'])}</storeEnabled> <!-- adjust to your CI provider -->
+        </remote>
+    </buildCache>
+</develocity>

.mvn/extensions.xml

@@ -1,4 +1,14 @@
 <extensions>
+    <extension>
+        <groupId>com.gradle</groupId>
+        <artifactId>develocity-maven-extension</artifactId>
+        <version>1.22.2</version>
+    </extension>
+    <extension>
+        <groupId>com.gradle</groupId>
+        <artifactId>common-custom-user-data-maven-extension</artifactId>
+        <version>2.0.1</version>
+    </extension>
 <!--
     <extension>
         <groupId>org.apache.maven.extensions</groupId>

.mvn/wrapper/maven-wrapper.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/4.0.0-alpha-13/apache-maven-4.0.0-alpha-13-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/4.0.0-beta-3/apache-maven-4.0.0-beta-3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar

.sdkmanrc

@@ -0,0 +1,4 @@
+# Enable auto-env through the sdkman_auto_env config
+# Add key=value pairs of SDKs to use below
+java=17.0.11-tem
+maven=4.0.0-beta-3

audits/pom.xml

@@ -129,7 +129,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
-                        <version>3.3.0</version>
+                        <version>3.5.0</version>
                         <executions>
                             <execution>
                                 <phase>generate-resources</phase>
@@ -164,7 +164,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
-                        <version>3.3.0</version>
+                        <version>3.5.0</version>
                         <executions>
                             <execution>
                                 <phase>generate-resources</phase>

audits/src/main/kotlin/dev/morphia/audits/GithubProject.kt

@@ -8,7 +8,8 @@ import org.kohsuke.github.GHLabel
 import org.kohsuke.github.GitHubBuilder
 
 object GithubProject {
-    var dryRun = false
+
+    var dryRun = System.getenv()["GITHUB_ACTION"] == null
     val github by lazy {
         GitHubBuilder.fromEnvironment().build().getRepository("MorphiaOrg/Morphia")
     }

audits/src/main/kotlin/dev/morphia/audits/OperationAudit.kt

@@ -14,7 +14,7 @@ import org.jsoup.select.Evaluator
 import org.kohsuke.github.GHIssueState.OPEN
 import org.kohsuke.github.GitHubBuilder
 
-private val core = File("../core/src/main/java")
+val mainRoot = File("../core/src/main/java").absoluteFile
 
 class OperationAudit(var methods: Map<String, List<MethodSource<*>>>) {
     companion object {
@@ -23,7 +23,7 @@ class OperationAudit(var methods: Map<String, List<MethodSource<*>>>) {
         }
 
         fun findMethods(taglet: String) =
-            core
+            mainRoot
                 .walkBottomUp()
                 .filter { it.extension == "java" }
                 .map { Roaster.parse(JavaType::class.java, it) }