diff --git a/build.gradle b/build.gradle
index fa3e810..d8d9d7e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 wrapper {
-    gradleVersion = "${project.property('gradle.wrapper.version')}"
+    gradleVersion = libs.versions.gradle.get()
     distributionType = Wrapper.DistributionType.ALL
 }
 
diff --git a/cql-common/src/main/java/org/xbib/cql/AbstractNode.java b/cql-common/src/main/java/org/xbib/cql/AbstractNode.java
index 715d662..cb7d666 100644
--- a/cql-common/src/main/java/org/xbib/cql/AbstractNode.java
+++ b/cql-common/src/main/java/org/xbib/cql/AbstractNode.java
@@ -5,6 +5,9 @@ package org.xbib.cql;
  */
 public abstract class AbstractNode implements Node {
 
+    public AbstractNode() {
+    }
+
     /**
      * Try to accept this node by a visitor.
      *
diff --git a/cql-common/src/main/java/org/xbib/cql/model/Option.java b/cql-common/src/main/java/org/xbib/cql/model/Option.java
index 150bd6d..3c91198 100644
--- a/cql-common/src/main/java/org/xbib/cql/model/Option.java
+++ b/cql-common/src/main/java/org/xbib/cql/model/Option.java
@@ -9,8 +9,12 @@ import org.xbib.cql.QueryOption;
 public class Option<V> implements QueryOption<V>, Comparable<Option<V>> {
 
     private String name;
+
     private V value;
 
+    public Option() {
+    }
+
     @Override
     public void setName(String name) {
         this.name = name;
diff --git a/cql-common/src/main/java/org/xbib/cql/model/breadcrumb/FacetBreadcrumbTrail.java b/cql-common/src/main/java/org/xbib/cql/model/breadcrumb/FacetBreadcrumbTrail.java
index 025c7ed..6c01da6 100644
--- a/cql-common/src/main/java/org/xbib/cql/model/breadcrumb/FacetBreadcrumbTrail.java
+++ b/cql-common/src/main/java/org/xbib/cql/model/breadcrumb/FacetBreadcrumbTrail.java
@@ -13,6 +13,9 @@ public class FacetBreadcrumbTrail<V> extends TreeSet<Facet<V>> {
 
     private static final long serialVersionUID = 6268000598739081048L;
 
+    public FacetBreadcrumbTrail() {
+    }
+
     @Override
     public String toString() {
         return toCQL();
diff --git a/cql-common/src/main/java/org/xbib/cql/model/breadcrumb/OptionBreadcrumbTrail.java b/cql-common/src/main/java/org/xbib/cql/model/breadcrumb/OptionBreadcrumbTrail.java
index 4ec1abb..d0d6ea6 100644
--- a/cql-common/src/main/java/org/xbib/cql/model/breadcrumb/OptionBreadcrumbTrail.java
+++ b/cql-common/src/main/java/org/xbib/cql/model/breadcrumb/OptionBreadcrumbTrail.java
@@ -15,6 +15,9 @@ public class OptionBreadcrumbTrail<V> extends TreeSet<Option<V>> {
 
     private static final long serialVersionUID = -3426025113354994279L;
 
+    public OptionBreadcrumbTrail() {
+    }
+
     @Override
     public String toString() {
         return toCQL();
diff --git a/cql-elasticsearch/build.gradle b/cql-elasticsearch/build.gradle
index 0cf98ad..2f4b62d 100644
--- a/cql-elasticsearch/build.gradle
+++ b/cql-elasticsearch/build.gradle
@@ -1,4 +1,4 @@
 dependencies {
     api project(':cql-common')
-    implementation "org.xbib:datastructures-json-tiny:${project.property('xbib-datastructures.version')}"
+    implementation libs.datastructures.json
 }
diff --git a/gradle.properties b/gradle.properties
index f844bc5..a1a1bf6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,5 @@
 group = org.xbib
 name = cql
-version = 4.1.2
+version = 5.0.0
 
 org.gradle.warning.mode = ALL
-gradle.wrapper.version = 7.3
-xbib-datastructures.version = 1.0.0
diff --git a/gradle/compile/java.gradle b/gradle/compile/java.gradle
index c9bba7f..224b9f4 100644
--- a/gradle/compile/java.gradle
+++ b/gradle/compile/java.gradle
@@ -6,13 +6,13 @@ java {
 }
 
 compileJava {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 compileTestJava {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 jar {
diff --git a/gradle/test/junit5.gradle b/gradle/test/junit5.gradle
index cfef972..88c0791 100644
--- a/gradle/test/junit5.gradle
+++ b/gradle/test/junit5.gradle
@@ -1,12 +1,9 @@
 
-def junitVersion = project.hasProperty('junit.version')?project.property('junit.version'):'5.6.2'
-def hamcrestVersion = project.hasProperty('hamcrest.version')?project.property('hamcrest.version'):'2.2'
-
 dependencies {
-    testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:${junitVersion}"
-    testImplementation "org.hamcrest:hamcrest-library:${hamcrestVersion}"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
+    testImplementation libs.junit.jupiter.api
+    testImplementation libs.junit.jupiter.params
+    testImplementation libs.hamcrest
+    testRuntimeOnly libs.junit.jupiter.engine
 }
 
 test {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180..249e583 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fbce071..8fad3f5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c787..a69d9cb 100755
--- a/gradlew
+++ b/gradlew
@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f..53a6b23 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/settings.gradle b/settings.gradle
index 78274c0..030bc25 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,17 @@
-
+dependencyResolutionManagement {
+    versionCatalogs {
+        libs {
+            version('gradle', '7.5.1')
+            version('groovy', '3.0.10')
+            version('junit', '5.9.1')
+            version('datastructures', '1.0.0')
+            library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit')
+            library('junit-jupiter-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit')
+            library('junit-jupiter-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit')
+            library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2')
+            library('datastructures-json', 'org.xbib', 'datastructures-json-tiny').versionRef('datastructures')
+        }
+    }
+}
 include 'cql-common'
 include 'cql-elasticsearch'