Merge branch 'publish'

# Conflicts:
#	CHANGELOG.md

Author: greenrobot-team

.gitlab-ci.yml

@@ -1,8 +1,9 @@
 # https://docs.gitlab.com/ci/yaml/
 
-# Default image for linux builds
-# This should match the image used to build the JVM database libraries (so Address Sanitizer library matches)
-image: objectboxio/buildenv-core:2024-07-11 # With JDK 17
+# Default Docker image (currently only supporting Docker Linux containers)
+# This should match the image used to build the JVM database libraries (so Address Sanitizer library matches).
+# When updating, check if the test-jdk jobs need changing.
+image: objectboxio/buildenv-core:2025-07-03 # With JDK 21
 
 # Assumes these environment variables are configured in GitLab CI/CD Settings:
 # - OBX_READ_PACKAGES_TOKEN
@@ -110,7 +111,6 @@ test-macos:
   tags:
     - jdk
     - mac
-    - x64
   script: ./gradlew $GITLAB_REPO_ARGS $VERSION_ARGS clean build
 
 # Address sanitizer is only available on Linux runners (see script).
@@ -138,12 +138,12 @@ test-jdk-8:
   variables:
     TEST_JDK: 8
 
-# JDK 17 is the default of the current build image, so test the latest LTS JDK 21
-test-jdk-21:
+# JDK 21 is the default of the current build image, so test the latest LTS JDK 25
+test-jdk-25:
   extends: .test-asan-template
   needs: ["test-jdk-8"]
   variables:
-    TEST_JDK: 21
+    TEST_JDK: 25
 
 test-jdk-x86:
   extends: .test-template

CHANGELOG.md

@@ -4,6 +4,80 @@ Notable changes to the ObjectBox Java library.
 
 For more insights into what changed in the database libraries, [check the ObjectBox C changelog](https://github.com/objectbox/objectbox-c/blob/main/CHANGELOG.md).
 
+## 5.3.0 - 2026-03-10
+
+- Gradle plugin: to apply the plugin, it is no longer necessary to add a manual mapping of the plugin ID in your
+  projects Gradle settings file. This was resolved by publishing Gradle plugin marker artifacts.
+  [#960](https://github.com/objectbox/objectbox-java/issues/960)
+- Gradle plugin: it is no longer necessary to apply the plugin after the dependencies block when manually including
+  ObjectBox dependencies.
+- Update database libraries for Android and JVM to database version `5.2.0-next-2026-03-10`
+- (Minor) performance improvements of HNSW vector search on Linux ARM targets
+                    
+### Sync
+
+- Sync protocol version 10
+- SyncClient: support updating filter variables. After login, stage updates using put and remove, then schedule to send
+  them to the server with `applyFilterVariables()`.
+- Update client sync filters variables when online
+- Clients report errors to the server
+
+### Migration instructions
+
+#### Drop the Gradle plugin ID mapping
+
+If your `settings.gradle.kts` or `settings.gradle` file contains lines similar to:
+
+```kotlin
+pluginManagement {
+    repositories {
+        mavenCentral()
+    }
+    
+    resolutionStrategy {
+        eachPlugin {
+            if (requested.id.id == "io.objectbox") {
+                useModule("io.objectbox:objectbox-gradle-plugin:${requested.version}")
+            }
+        }
+    }
+}
+```
+
+Update them to remove the plugin mapping configuration:
+
+```kotlin
+pluginManagement {
+    repositories {
+        mavenCentral()
+    }
+}
+```
+
+#### Apply the plugin using plugins syntax
+
+If your build scripts are applying the plugin after the dependencies block similar to:
+
+```kotlin
+dependencies {
+    // ...  
+} 
+
+apply(plugin = "io.objectbox")
+```
+
+Change them to apply the plugin using plugins syntax:
+
+```kotlin
+plugins {
+    id("io.objectbox")
+}
+
+dependencies {
+    // ...  
+}
+```
+
 ## 5.2.0 - 2026-02-16
 
 - The [ObjectBox Gradle plugin](https://github.com/objectbox/objectbox-java-generator) requires JDK 11 and Android

README.md

@@ -145,19 +145,15 @@ When using a [TOML version catalog](https://docs.gradle.org/current/userguide/ve
 # gradle/libs.versions.toml
 
 [versions]
-# Define a variable for the version of the plugin
-objectbox = "5.2.0"
-
 # For an Android project
-agp = "<AGP_VERSION>"
-
+agp = "AGP_VERSION"
 # If using Kotlin
-kotlin = "<KOTLIN_VERSION>"
+kotlin = "KOTLIN_VERSION"
 
-[plugins]
-# Add an alias for the plugin
-objectbox = { id = "io.objectbox", version.ref = "objectbox" }
+# Define a variable for the version of the ObjectBox plugin
+objectbox = "5.3.0"
 
+[plugins]
 # For an Android project, using Android Gradle Plugin 9.0 or newer
 android-application = { id = "com.android.application", version.ref = "agp" }
 kotlin-kapt = { id = "com.android.legacy-kapt", version.ref = "agp" }
@@ -170,15 +166,15 @@ kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
 # For a JVM project, if using Kotlin 
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
+
+# Add an alias for the ObjectBox plugin
+objectbox = { id = "io.objectbox", version.ref = "objectbox" }
 ```
 
 ```kotlin
 // build.gradle.kts
 
 plugins {
-    // Add the plugin
-    alias(libs.plugins.objectbox) apply false
-
     // For an Android project, using Android Gradle Plugin 9.0 or newer
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.kotlin.kapt) apply false  
@@ -191,6 +187,9 @@ plugins {
     // For a JVM project, if using Kotlin
     alias(libs.plugins.kotlin.jvm) apply false
     alias(libs.plugins.kotlin.kapt) apply false
+  
+    // Add the ObjectBox plugin
+    alias(libs.plugins.objectbox) apply false  
 }
 
 allprojects {
@@ -209,14 +208,13 @@ pluginManagement {
         // Add Maven Central to the plugin repositories
         mavenCentral()
     }
-    
-    resolutionStrategy {
-        eachPlugin {
-            // Map the plugin ID to the Maven artifact
-            if (requested.id.id == "io.objectbox") {
-                useModule("io.objectbox:objectbox-gradle-plugin:${requested.version}")
-            }
-        }
+}
+
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        // Add Maven Central to the dependency repositories
+        mavenCentral()
     }
 }
 ```
@@ -242,7 +240,7 @@ plugins {
     alias(libs.plugins.kotlin.jvm)
     alias(libs.plugins.kotlin.kapt)
 
-    // Finally, apply the plugin
+    // Finally, apply the ObjectBox plugin
     alias(libs.plugins.objectbox)
 }
 ```
@@ -259,8 +257,8 @@ Your project can now use ObjectBox, continue by [defining entity classes](https:
 // build.gradle.kts
 
 plugins {
-    // Add the plugin
-    id("io.objectbox") version "5.2.0" apply false
+    // Add the ObjectBox plugin
+    id("io.objectbox") version "5.3.0" apply false
 }
 
 allprojects {
@@ -279,14 +277,13 @@ pluginManagement {
         // Add Maven Central to the plugin repositories
         mavenCentral()
     }
+}
 
-    resolutionStrategy {
-        eachPlugin {
-            // Map the plugin ID to the Maven artifact
-            if (requested.id.id == "io.objectbox") {
-                useModule("io.objectbox:objectbox-gradle-plugin:${requested.version}")
-            }
-        }
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        // Add Maven Central to the dependency repositories
+        mavenCentral()
     }
 }
 ```
@@ -299,16 +296,16 @@ pluginManagement {
 // build.gradle.kts
 
 buildscript {
-    // Define a variable for the plugin version
-    val objectboxVersion by extra("5.2.0")
+    // Define a variable for the ObjectBox plugin version
+    val objectboxVersion by extra("5.3.0")
 
     repositories {
         // Add Maven Central to the plugin repositories     
         mavenCentral()    
     }
 
     dependencies {
-        // Add the plugin
+        // Add the ObjectBox plugin
         classpath("io.objectbox:objectbox-gradle-plugin:$objectboxVersion")
     }
 }
@@ -329,16 +326,16 @@ allprojects {
 // build.gradle
 
 buildscript {
-    // Define a variable for the plugin version
-    ext.objectboxVersion = "5.2.0"
+    // Define a variable for the ObjectBox plugin version
+    ext.objectboxVersion = "5.3.0"
   
     repositories {        
         // Add Maven Central to the plugin repositories
         mavenCentral()    
     }
   
     dependencies {
-        // Add the plugin
+        // Add the ObjectBox plugin
         classpath("io.objectbox:objectbox-gradle-plugin:$objectboxVersion")
     }
 }
@@ -374,7 +371,7 @@ plugins {
     id("org.jetbrains.kotlin.jvm") // or kotlin("jvm")
     id("org.jetbrains.kotlin.kapt") // or kotlin("kapt")  
 
-    // Finally, apply the plugin
+    // Finally, apply the ObjectBox plugin
     id("io.objectbox")
 }
 ```

build.gradle.kts

@@ -20,7 +20,7 @@ plugins {
 buildscript {
     // Version of Maven artifacts
     // Should only be changed as part of the release process, see the release checklist in the objectbox repo
-    val versionNumber = "5.2.0"
+    val versionNumber = "5.3.0"
 
     // Release mode should only be enabled when manually triggering a CI pipeline,
     // see the release checklist in the objectbox repo.

objectbox-java/build.gradle.kts

@@ -1,7 +1,3 @@
-import kotlin.io.path.appendText
-import kotlin.io.path.readText
-import kotlin.io.path.writeText
-
 plugins {
     id("java-library")
     id("objectbox-publish")
@@ -69,9 +65,20 @@ val javadocForWeb by tasks.registering(Javadoc::class) {
     group = "documentation"
     description = "Builds Javadoc incl. objectbox-java-api classes with web tweaks."
 
+    // Register used files as inputs so task is re-run if they change
+    // https://docs.gradle.org/current/userguide/incremental_build.html
+    val customOverview = layout.projectDirectory.file("src/web/overview.html")
+    inputs.file(customOverview)
+        .withPropertyName("customOverview")
+        .withPathSensitivity(PathSensitivity.NONE)
+    val customStylesheet = layout.projectDirectory.file("src/web/objectbox-stylesheet.css")
+    inputs.file(customStylesheet)
+        .withPropertyName("customStylesheet")
+        .withPathSensitivity(PathSensitivity.NONE)
+
     javadocTool.set(javaToolchains.javadocToolFor {
-        // Note: the style changes only work if using JDK 10+, 17 is the LTS release used to publish this
-        languageVersion.set(JavaLanguageVersion.of(17))
+        // Note: the style changes only work if using JDK 10+, 21 is the LTS release used to publish this
+        languageVersion.set(JavaLanguageVersion.of(21))
     })
 
     val srcApi = project(":objectbox-java-api").file("src/main/java/")
@@ -104,33 +111,18 @@ val javadocForWeb by tasks.registering(Javadoc::class) {
     source = filteredSources + fileTree(srcApi)
 
     classpath = sourceSets.main.get().output + sourceSets.main.get().compileClasspath
-    setDestinationDir(javadocForWebDir.get().asFile)
+    destinationDir = javadocForWebDir.get().asFile
 
     title = "ObjectBox Java ${project.version} API"
     (options as StandardJavadocDocletOptions).apply {
-        overview = "$projectDir/src/web/overview.html"
-        bottom = "Available under the Apache License, Version 2.0 - <i>Copyright &#169; 2017-2025 <a href=\"https://objectbox.io/\">ObjectBox Ltd</a>. All Rights Reserved.</i>"
+        overview = customOverview.toString()
+        bottom = "Available under the Apache License, Version 2.0 - <i>Copyright &#169; 2017-2026 <a href=\"https://objectbox.io/\">ObjectBox Ltd</a>. All Rights Reserved.</i>"
+        // Customize the default stylesheet https://docs.oracle.com/en/java/javase/21/javadoc/javadoc-css-themes.html
+        // Note: the javadoc option is "--add-stylesheet", but addStringOption already ads a single dash ("-")
+        addStringOption("-add-stylesheet", customStylesheet.toString())
     }
 
     doLast {
-        // Note: frequently check the vanilla stylesheet.css if values still match.
-        val stylesheetPath = "$destinationDir/stylesheet.css"
-
-        // Adjust the CSS stylesheet
-
-        // Change some color values
-        // The stylesheet file should be megabytes at most, so read it as a whole
-        val stylesheetFile = kotlin.io.path.Path(stylesheetPath)
-        val originalContent = stylesheetFile.readText()
-        val replacedContent = originalContent
-            .replace("#4D7A97", "#17A6A6") // Primary background
-            .replace("#F8981D", "#7DDC7D") // "Active" background
-            .replace("#bb7a2a", "#E61955") // Hover
-        stylesheetFile.writeText(replacedContent)
-        // Note: in CSS stylesheets the last added rule wins, so append to default stylesheet.
-        // Make code blocks scroll instead of stick out on small width
-        stylesheetFile.appendText("pre {\n    overflow-x: auto;\n}\n")
-
         println("Javadoc for web created at $destinationDir")
     }
 }

objectbox-java/src/main/java/io/objectbox/BoxStore.java

@@ -82,7 +82,7 @@ public class BoxStore implements Closeable {
      * ReLinker uses this as a suffix for the extracted shared library file. If different, it will update it. Should be
      * unique to avoid conflicts.
      */
-    public static final String JNI_VERSION = "5.1.1-2026-02-16";
+    public static final String JNI_VERSION = "5.2.0-2026-03-10";
 
     /**
      * The ObjectBox database version this Java library is known to work with.
@@ -92,7 +92,7 @@ public class BoxStore implements Closeable {
      * This is used (currently only in tests) to make sure a database library has a compatible JNI API by checking the
      * version number matches exactly and the date is the same or newer.
      */
-    private static final String VERSION = "5.1.1-2026-02-16";
+    private static final String VERSION = "5.2.0-2026-03-10";
 
     private static final String OBJECTBOX_PACKAGE_NAME = "objectbox";
     private static BoxStore defaultStore;