diff --git a/modello-build.tar.xz b/modello-build.tar.xz
index bb3d01a..49cb46e 100644
--- a/modello-build.tar.xz
+++ b/modello-build.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee176329926f1df29eab07cc40217493b554e9e42237ab15ade217b05f99a92d
-size 4724
+oid sha256:fe5b07e41e14607b14161d843f3962dbe9fe357d39860b8aff6eaf35c2656374
+size 4624
diff --git a/modello-maven-plugin.changes b/modello-maven-plugin.changes
index 18a2f7a..bbf2e53 100644
--- a/modello-maven-plugin.changes
+++ b/modello-maven-plugin.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 22 14:07:46 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build with java source and target levels 8
+
 -------------------------------------------------------------------
 Mon Apr 26 10:52:49 UTC 2021 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/modello-maven-plugin.spec b/modello-maven-plugin.spec
index 7c6fde1..3b486e3 100644
--- a/modello-maven-plugin.spec
+++ b/modello-maven-plugin.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package modello-maven-plugin
+# spec file
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -91,9 +91,12 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml
 %pom_remove_dep :modello-plugin-jsonschema modello-maven-plugin
 
 %build
-# skip tests because we have too old xmlunit in openSUSE now (1.5)
 pushd %{name}
-%{mvn_build} -f -- -Dmaven.version=3.1.1 -Dsource=6
+%{mvn_build} -f -- \
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
+    -Dmaven.compiler.release=8 \
+%endif
+    -Dmaven.version=3.1.1 -Dsource=8
 popd
 
 %install
diff --git a/modello.changes b/modello.changes
index c2fab72..b19a9cf 100644
--- a/modello.changes
+++ b/modello.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 22 14:07:24 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build with java source and target levels 8
+
 -------------------------------------------------------------------
 Mon Apr 26 10:52:49 UTC 2021 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/modello.spec b/modello.spec
index 9eda594..930fe81 100644
--- a/modello.spec
+++ b/modello.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package modello
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed