diff --git a/zap/gradle.properties b/zap/gradle.properties
index e3468ef436b..d994f9ba364 100644
--- a/zap/gradle.properties
+++ b/zap/gradle.properties
@@ -1,2 +1,2 @@
-version=2.17.0
-zap.japicmp.baseversion=2.16.1
+version=2.18.0-SNAPSHOT
+zap.japicmp.baseversion=2.17.0
diff --git a/zap/gradle/japicmp.yaml b/zap/gradle/japicmp.yaml
index c151f02b0f5..a8b3c09a0e8 100644
--- a/zap/gradle/japicmp.yaml
+++ b/zap/gradle/japicmp.yaml
@@ -4,16 +4,5 @@
 ---
 packageExcludes: []
 fieldExcludes: []
-classExcludes:
-  - "org.parosproxy.paros.core.scanner.VariantAbstractRPCQuery$RPCParameter"
-  - "org.parosproxy.paros.core.scanner.VariantJSONQuery$SimpleStringReader"
-  - "org.parosproxy.paros.db.RecordAlert"
-  - "org.parosproxy.paros.db.TableAlert"
-  - "org.parosproxy.paros.db.paros.ParosTableAlert"
-  - "org.zaproxy.zap.db.sql.SqlTableAlert"
-methodExcludes:
-  - "org.zaproxy.zap.model.SessionStructure#addPath(org.parosproxy.paros.model.Session,org.parosproxy.paros.model.HistoryReference,org.parosproxy.paros.network.HttpMessage)"
-  - "org.zaproxy.zap.model.SessionStructure#addPath(org.parosproxy.paros.model.Session,org.parosproxy.paros.model.HistoryReference,org.parosproxy.paros.network.HttpMessage,boolean)"
-  - "org.zaproxy.zap.model.SessionStructure#find(long,org.apache.commons.httpclient.URI,java.lang.String,java.lang.String)"
-  - "org.zaproxy.zap.model.SessionStructure#getNodeName(org.parosproxy.paros.network.HttpMessage)"
-  - "org.zaproxy.zap.model.SessionStructure#getRootNode()"
\ No newline at end of file
+classExcludes: []
+methodExcludes: []
\ No newline at end of file