diff --git a/gradle.properties b/gradle.properties
index c78bf71..9075dce 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,8 @@
 group = org.xbib
 name = z3950
-version = 2.1.0
+version = 2.2.0
 
 gradle.wrapper.version = 6.4.1
-netty.version = 4.1.49.Final
-xbib-cql.version = 3.0.0
-xbib-bibliographic-character-sets.version = 1.0.0
\ No newline at end of file
+netty.version = 4.1.50.Final
+xbib-cql.version = 3.0.1
+xbib-bibliographic-character-sets.version = 2.0.0
\ No newline at end of file
diff --git a/gradle/compile/java.gradle b/gradle/compile/java.gradle
index 7b1e601..c9bba7f 100644
--- a/gradle/compile/java.gradle
+++ b/gradle/compile/java.gradle
@@ -33,3 +33,11 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 artifacts {
     archives sourcesJar, javadocJar
 }
+
+tasks.withType(JavaCompile) {
+    options.compilerArgs << '-Xlint:all,-fallthrough'
+}
+
+javadoc {
+    options.addStringOption('Xdoclint:none', '-quiet')
+}
diff --git a/z3950-api/src/main/java/module-info.java b/z3950-api/src/main/java/module-info.java
index 9e13282..4d3cf5a 100644
--- a/z3950-api/src/main/java/module-info.java
+++ b/z3950-api/src/main/java/module-info.java
@@ -1,4 +1,4 @@
 module org.xbib.z3950lib.api {
     exports org.xbib.z3950.api;
-    requires org.xbib.z3950lib.asn;
+    requires transitive org.xbib.z3950lib.asn;
 }
diff --git a/z3950-client-netty/build.gradle b/z3950-client-netty/build.gradle
index 453077e..b8dc1d1 100644
--- a/z3950-client-netty/build.gradle
+++ b/z3950-client-netty/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    implementation project(':z3950-common')
+    api project(':z3950-common')
     implementation "io.netty:netty-handler:${project.property('netty.version')}"
     implementation "io.netty:netty-transport:${project.property('netty.version')}"
-}
\ No newline at end of file
+}
diff --git a/z3950-client-netty/src/main/java/module-info.java b/z3950-client-netty/src/main/java/module-info.java
index db8a232..fb5ae51 100644
--- a/z3950-client-netty/src/main/java/module-info.java
+++ b/z3950-client-netty/src/main/java/module-info.java
@@ -1,6 +1,6 @@
 module org.xbib.z3950lib.client.netty {
     exports org.xbib.z3950.client.netty;
-    requires org.xbib.z3950lib.common;
+    requires transitive org.xbib.z3950lib.common;
     requires io.netty.handler;
     requires io.netty.transport;
 }
diff --git a/z3950-client/build.gradle b/z3950-client/build.gradle
index 4057fc2..3c6ea70 100644
--- a/z3950-client/build.gradle
+++ b/z3950-client/build.gradle
@@ -1,5 +1,4 @@
 dependencies {
     api project(':z3950-common')
     testImplementation "org.xbib:bibliographic-character-sets:${project.property('xbib-bibliographic-character-sets.version')}"
-
 }
\ No newline at end of file
diff --git a/z3950-client/src/main/java/module-info.java b/z3950-client/src/main/java/module-info.java
index 25669a1..4e25d0b 100644
--- a/z3950-client/src/main/java/module-info.java
+++ b/z3950-client/src/main/java/module-info.java
@@ -1,7 +1,5 @@
 module org.xbib.z3950lib.client {
     exports org.xbib.z3950.client;
-    requires org.xbib.z3950lib.common;
-    requires org.xbib.z3950lib.asn;
-    requires org.xbib.z3950lib.api;
+    requires transitive org.xbib.z3950lib.common;
     requires java.logging;
 }
\ No newline at end of file
diff --git a/z3950-common/build.gradle b/z3950-common/build.gradle
index 1c0b29d..8b2a40e 100644
--- a/z3950-common/build.gradle
+++ b/z3950-common/build.gradle
@@ -5,7 +5,7 @@ plugins {
 
 dependencies {
     api project(':z3950-api')
-    implementation "org.xbib:cql-common:${project.property('xbib-cql.version')}"
+    api "org.xbib:cql-common:${project.property('xbib-cql.version')}"
 }
 
 sourceSets {
diff --git a/z3950-common/src/main/java/module-info.java b/z3950-common/src/main/java/module-info.java
index 375199a..1d129b3 100644
--- a/z3950-common/src/main/java/module-info.java
+++ b/z3950-common/src/main/java/module-info.java
@@ -5,8 +5,7 @@ module org.xbib.z3950lib.common {
     exports org.xbib.z3950.common.operations;
     exports org.xbib.z3950.common.pqf;
     exports org.xbib.z3950.common.v3;
-    requires org.xbib.z3950lib.api;
-    requires org.xbib.z3950lib.asn;
-    requires org.xbib.cql;
+    requires transitive org.xbib.z3950lib.api;
+    requires transitive org.xbib.cql;
     requires java.logging;
-}
\ No newline at end of file
+}