6 files changed, 36 insertions, 31 deletions
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 368123d5..1b1b4844 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -1,4 +1,4 @@
-name: Continous build - build and test on every push
+name: Continous build on every push
 
 on:
   push:
@@ -7,12 +7,11 @@ on:
       - gh-pages
 
 jobs:
-  build:
-    name: Build and test
-    runs-on: ${{ matrix.os }}
+  build_linux:
+    name: Linux build and test
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
         java-version: [8, 11]
     
     steps:
@@ -26,39 +25,43 @@ jobs:
         with:
           java-version: ${{ matrix.java-version }}
 
+      - name: Setup Moxie
+        run: |
+          wget http://gitblit.github.io/moxie/maven/com/gitblit/moxie/moxie+ant/0.9.4/moxie+ant-0.9.4.tar.gz
+          tar -xzf moxie+ant-0.9.4.tar.gz
+          moxie-0.9.4/bin/moxie -version
+
       - name: Report Java version
         run: |
           java -version
           javac -version
 
-      - name: Build with Ant
-        run: ant test
+      - name: Build with Moxie
+        run: moxie-0.9.4/bin/moxie test
+
+
+  build_windows:
+    name: Windows build and test
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        java-version: [8, 11]
 
-  build_j7:
-    name: Build and test on Java 7
-    runs-on: ubuntu-latest
-    
     steps:
       - name: Checkout
         uses: actions/checkout@v1
         with:
           submodules: true
 
-      - name: Setup Java 7
+      - name: Setup Java ${{ matrix.java-version }}
         uses: actions/setup-java@v1
         with:
-          java-version: 7
+          java-version: ${{ matrix.java-version }}
 
       - name: Report Java version
         run: |
           java -version
           javac -version
 
-      - name: Setup Moxie
-        run: |
-          wget http://gitblit.github.io/moxie/maven/com/gitblit/moxie/moxie+ant/0.9.4/moxie+ant-0.9.4.tar.gz
-          tar -xzf moxie+ant-0.9.4.tar.gz
-          moxie-0.9.4/bin/moxie -version
-
-      - name: Build with Moxie
-        run:  moxie-0.9.4/bin/moxie test
+      - name: Build with Ant
+        run: ant test
diff --git a/.travis.yml b/.travis.yml
index c02000c7..63f00a90 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,5 @@ dist: trusty
 language: java
 
 jdk:
-  - openjdk7
   - openjdk8
   - oraclejdk11
diff --git a/README.markdown b/README.markdown
index c826be67..1cd14889 100644
--- a/README.markdown
+++ b/README.markdown
@@ -18,7 +18,7 @@ The text of the license is included in the file LICENSE in the root of the proje
 Java Runtime Requirement
 ------------------------------------
 
-Gitblit requires at Java 7 Runtime Environment (JRE) or a Java 7 Development Kit (JDK).
+Gitblit requires at Java 8 Runtime Environment (JRE) or a Java 8 Development Kit (JDK).
 
 Getting help
 ------------
diff --git a/build.moxie b/build.moxie
index 8e77d464..74db6038 100644
--- a/build.moxie
+++ b/build.moxie
@@ -69,15 +69,15 @@ resourceDirectories:
 - test 'src/test/resources'
 - site 'src/site/resources'
 
-# compile for Java 7 class format
+# compile for Java 8 class format
 tasks: {
 	'mx:javac' : {
-        source: 1.7
-        target: 1.7
-        compiler: javac1.7
+        source: 1.8
+        target: 1.8
+        compiler: javac1.8
         encoding: UTF-8
         # stop complaints about bootstrap classpath when compiling with Java 7
-        compilerArgs: '-Xlint:-options'
+        # compilerArgs: '-Xlint:-options'
     }
 }
 
diff --git a/releases.moxie b/releases.moxie
index 4b8f0717..d3e3fe18 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -5,12 +5,15 @@ r33: {
     title: ${project.name} ${project.version} released
     id: ${project.version}
     date: ${project.buildDate}
-    note: ~
+    note: ''
+          From 1.10.0 on Gitblit requires Java 8 as minimun Java version.
+          ''
     html: ~
     text: ~
     security: ~
     fixes: ~
-    changes: ~
+    changes:
+      - Minimum Java required increased to Java 8
     additions: ~
     dependencyChanges: ~
     contributors: ~
diff --git a/src/site/siteindex.mkd b/src/site/siteindex.mkd
index 5323c46b..2415fb54 100644
--- a/src/site/siteindex.mkd
+++ b/src/site/siteindex.mkd
@@ -91,7 +91,7 @@ Gitblit includes a backup mechanism (*federation*) which can be used to backup r
 
 ### Java Runtime Requirement
 
-Gitblit requires a Java 7 Runtime Environment (JRE) or a Java 7 Development Kit (JDK).
+Gitblit requires a Java 8 Runtime Environment (JRE) or a Java 8 Development Kit (JDK).
 
 [jgit]: http://eclipse.org/jgit "Eclipse JGit Site"
 [git]: http://git-scm.com "Official Git Site"