diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
new file mode 100644
index 0000000000..fd7443fbb8
--- /dev/null
+++ b/.github/workflows/changelog.yml
@@ -0,0 +1,21 @@
+name: changelog lint
+on:
+  pull_request:
+    paths:
+      - 'ChangeLog'
+
+jobs:
+  check-changelog:
+    runs-on: ubuntu-latest
+
+  steps:
+    - name: Check out repository
+      uses: actions/checkout@v2
+
+   - name: Check for duplicate versions in Changelog
+     run: |
+       if grep -P 'Version \d+\.\d+\.\d+' ChangeLog | sort | uniq -d; then
+       echo "Duplicate versions found in Changelog"
+       exit 1
+       fi
+
diff --git a/docs/BUILD b/docs/BUILD
index 4a8fa3a796..a013ffdda0 100644
--- a/docs/BUILD
+++ b/docs/BUILD
@@ -58,7 +58,7 @@ genrule(
 # Plugin versions to pull the docs from
 plugins = {
     "python": "v1.5.0",
-    "java": "v0.3.0",
+    "java": "v0.4.0",
     "go": "v1.11.5",
     "cc": "v0.4.0",
     "shell": "v0.2.0",