diff --git a/CHANGELOG b/CHANGELOG
index e44560d2a2..8dfac69c7b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -186,6 +186,8 @@ v3.3
- Fixed NPE in parse error situation (Hacker scenario)
- Never let any NPE disturb the calling application ever again
-v3.4
+v4.0
===
+- Switch Analyzer to interface with default methods
+- Rename package annonate to annotate (which was a typo)
- Upgrade Antlr to 4.7.1 and get rid of bug workaround
diff --git a/ReleaseProcedure.txt b/ReleaseProcedure.txt
index afc74344f9..1d195665a6 100644
--- a/ReleaseProcedure.txt
+++ b/ReleaseProcedure.txt
@@ -8,8 +8,8 @@ mvn clean verify -Pplatfora
mvn clean -Pplatfora
# Prepare the versions for the release
-RELEASEVERSION=3.3
-NEXTVERSION=3.4
+RELEASEVERSION=4.0
+NEXTVERSION=4.1
# Creating and publishing the new Tagging
mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${RELEASEVERSION}
diff --git a/analyzer/pom.xml b/analyzer/pom.xml
index 3799539ac8..3390cae763 100644
--- a/analyzer/pom.xml
+++ b/analyzer/pom.xml
@@ -24,7 +24,7 @@
yauaa-parent
nl.basjes.parse.useragent
- 3.4-SNAPSHOT
+ 4.0-SNAPSHOT
yauaa
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 6e66a2e6e6..ba87000567 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -22,7 +22,7 @@
yauaa-parent
nl.basjes.parse.useragent
- 3.4-SNAPSHOT
+ 4.0-SNAPSHOT
yauaa-benchmark
diff --git a/commandline/pom.xml b/commandline/pom.xml
index f6939b1e5a..ce17fd9345 100644
--- a/commandline/pom.xml
+++ b/commandline/pom.xml
@@ -24,7 +24,7 @@
yauaa-parent
nl.basjes.parse.useragent
- 3.4-SNAPSHOT
+ 4.0-SNAPSHOT
yauaa-commandline
diff --git a/devtools/pom.xml b/devtools/pom.xml
index 8dd9017c4f..280ef2331b 100644
--- a/devtools/pom.xml
+++ b/devtools/pom.xml
@@ -22,7 +22,7 @@
yauaa-parent
nl.basjes.parse.useragent
- 3.4-SNAPSHOT
+ 4.0-SNAPSHOT
4.0.0
diff --git a/pom.xml b/pom.xml
index 51562e9f1b..cf046acb1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
yauaa-parent
pom
nl.basjes.parse.useragent
- 3.4-SNAPSHOT
+ 4.0-SNAPSHOT
Yauaa :
A parsing and analyzing library to get information from a useragent string.
diff --git a/udfs/beam/pom.xml b/udfs/beam/pom.xml
index b405cfa725..7b80401c06 100644
--- a/udfs/beam/pom.xml
+++ b/udfs/beam/pom.xml
@@ -24,7 +24,7 @@
yauaa-udf-parent
nl.basjes.parse.useragent
- 3.4-SNAPSHOT
+ 4.0-SNAPSHOT
yauaa-beam
diff --git a/udfs/flink/pom.xml b/udfs/flink/pom.xml
index b9a62fae4f..08f3349b55 100644
--- a/udfs/flink/pom.xml
+++ b/udfs/flink/pom.xml
@@ -24,7 +24,7 @@
yauaa-udf-parent
nl.basjes.parse.useragent
- 3.4-SNAPSHOT
+ 4.0-SNAPSHOT
yauaa-flink
diff --git a/udfs/hive/pom.xml b/udfs/hive/pom.xml
index a9a1a5b97d..749ce773d2 100644
--- a/udfs/hive/pom.xml
+++ b/udfs/hive/pom.xml
@@ -24,7 +24,7 @@
yauaa-udf-parent
nl.basjes.parse.useragent
- 3.4-SNAPSHOT
+ 4.0-SNAPSHOT
yauaa-hive
diff --git a/udfs/logparser/pom.xml b/udfs/logparser/pom.xml
index 40fb72fb81..c3a4fbcf54 100644
--- a/udfs/logparser/pom.xml
+++ b/udfs/logparser/pom.xml
@@ -24,7 +24,7 @@
yauaa-udf-parent
nl.basjes.parse.useragent
- 3.4-SNAPSHOT
+ 4.0-SNAPSHOT
yauaa-logparser
diff --git a/udfs/pig/pom.xml b/udfs/pig/pom.xml
index 42af863574..a49ff679f1 100644
--- a/udfs/pig/pom.xml
+++ b/udfs/pig/pom.xml
@@ -25,7 +25,7 @@
yauaa-udf-parent
nl.basjes.parse.useragent
- 3.4-SNAPSHOT
+ 4.0-SNAPSHOT
yauaa-pig
diff --git a/udfs/platfora/pom.xml b/udfs/platfora/pom.xml
index 8b0b2587b9..bf0db66a39 100644
--- a/udfs/platfora/pom.xml
+++ b/udfs/platfora/pom.xml
@@ -25,7 +25,7 @@
yauaa-udf-parent
nl.basjes.parse.useragent
- 3.4-SNAPSHOT
+ 4.0-SNAPSHOT
yauaa-platfora
diff --git a/udfs/pom.xml b/udfs/pom.xml
index d98cf19074..0bee720922 100644
--- a/udfs/pom.xml
+++ b/udfs/pom.xml
@@ -22,7 +22,7 @@
yauaa-parent
nl.basjes.parse.useragent
- 3.4-SNAPSHOT
+ 4.0-SNAPSHOT
4.0.0
pom
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 57cd8361d4..2354edff23 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -22,7 +22,7 @@
yauaa-parent
nl.basjes.parse.useragent
- 3.4-SNAPSHOT
+ 4.0-SNAPSHOT
4.0.0
war