diff --git a/maven-surefire-build.tar.xz b/maven-surefire-build.tar.xz
index 8a63c24..07e916e 100644
--- a/maven-surefire-build.tar.xz
+++ b/maven-surefire-build.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:72878f7262cd6b87496ec974366d98dd676cb513ecc9d67eaa294e18b6b92ea0
-size 5484
+oid sha256:3b72fc5689f053e54a6f1a61af232329730439e7b2bc394438d3febc2ad03eb0
+size 5604
diff --git a/maven-surefire-plugins.changes b/maven-surefire-plugins.changes
index 08b571b..796d40e 100644
--- a/maven-surefire-plugins.changes
+++ b/maven-surefire-plugins.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 22 13:53:34 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build with source and target level 8
+
 -------------------------------------------------------------------
 Mon Apr 19 16:59:36 UTC 2021 - Pedro Monreal <pmonreal@suse.com>
 
diff --git a/maven-surefire-plugins.spec b/maven-surefire-plugins.spec
index a880941..35b0fdf 100644
--- a/maven-surefire-plugins.spec
+++ b/maven-surefire-plugins.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package maven-surefire-plugins
+# 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
@@ -23,7 +23,7 @@ Release:        0
 Summary:        Test framework project
 License:        Apache-2.0 AND CPL-1.0
 Group:          Development/Libraries/Java
-URL:            http://maven.apache.org/surefire/
+URL:            https://maven.apache.org/surefire/
 # ./generate-tarball.sh
 Source0:        %{base_name}-%{version}.tar.gz
 # Remove bundled binaries which cannot be easily verified for licensing
@@ -34,6 +34,7 @@ Patch1:         0002-Port-to-current-doxia.patch
 Patch2:         0003-Port-to-TestNG-6.11.patch
 Patch3:         0004-Port-to-current-maven-shared-utils.patch
 BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  maven-local
 BuildRequires:  mvn(commons-io:commons-io)
 BuildRequires:  mvn(org.apache.commons:commons-lang3)
@@ -161,20 +162,21 @@ find . -name dependency-reduced-pom.xml -delete
 %{mvn_package} ":*junit-platform*" junit5
 %{mvn_package} ":*{junit,testng,failsafe-plugin,report-parser}*"  @1
 
-%mvn_artifact pom.xml
+%{mvn_artifact} pom.xml
 mkdir -p target/site/apidocs
 for i in \
-   maven-failsafe-plugin \
-   maven-surefire-plugin \
-   maven-surefire-report-plugin; do
+    maven-failsafe-plugin \
+    maven-surefire-plugin \
+    maven-surefire-report-plugin; do
   pushd ${i}
-    %mvn_build -f \
+    %{mvn_build} -f -- \
 %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-	-- -Dmaven.compiler.release=6
+    -Dmaven.compiler.release=8 \
 %endif
+    -Dsource=8
 
   popd
-  %mvn_artifact ${i}/pom.xml ${i}/target/${i}-%{version}.jar
+  %{mvn_artifact} ${i}/pom.xml ${i}/target/${i}-%{version}.jar
   if [ -d ${i}/target/site/apidocs ]; then
     cp -r ${i}/target/site/apidocs target/site/apidocs/${i}
   fi
diff --git a/maven-surefire-provider-junit5.changes b/maven-surefire-provider-junit5.changes
index b4a4e87..159206f 100644
--- a/maven-surefire-provider-junit5.changes
+++ b/maven-surefire-provider-junit5.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 22 13:53:55 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build with source and target levels 8
+
 -------------------------------------------------------------------
 Mon Apr 19 16:59:36 UTC 2021 - Pedro Monreal <pmonreal@suse.com>
 
diff --git a/maven-surefire-provider-junit5.spec b/maven-surefire-provider-junit5.spec
index 1a283a9..64fd2ac 100644
--- a/maven-surefire-provider-junit5.spec
+++ b/maven-surefire-provider-junit5.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package maven-surefire-provider-junit5
+# 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
@@ -23,7 +23,7 @@ Release:        0
 Summary:        JUnit 5 provider for Maven Surefire
 License:        Apache-2.0 AND CPL-1.0
 Group:          Development/Libraries/Java
-URL:            http://maven.apache.org/surefire/
+URL:            https://maven.apache.org/surefire/
 # ./generate-tarball.sh
 Source0:        %{base_name}-%{version}.tar.gz
 # Remove bundled binaries which cannot be easily verified for licensing
@@ -34,6 +34,7 @@ Patch1:         0002-Port-to-current-doxia.patch
 Patch2:         0003-Port-to-TestNG-6.11.patch
 Patch3:         0004-Port-to-current-maven-shared-utils.patch
 BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  maven-local
 BuildRequires:  mvn(org.apache.maven.surefire:common-java5)
 BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
@@ -105,10 +106,11 @@ sed -i /-Xdoclint:all/d pom.xml
 
 %build
 pushd surefire-providers/surefire-junit-platform
-%mvn_build -f \
+%{mvn_build} -f -- \
 %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-	-- -Dmaven.compiler.release=8
+    -Dmaven.compiler.release=8 \
 %endif
+    -Dsource=8
 
 popd
 
diff --git a/maven-surefire.changes b/maven-surefire.changes
index 1c8ab5c..d73daf7 100644
--- a/maven-surefire.changes
+++ b/maven-surefire.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 22 13:52:58 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build with java source and target levels 8
+
 -------------------------------------------------------------------
 Mon Apr 19 16:59:36 UTC 2021 - Pedro Monreal <pmonreal@suse.com>
 
diff --git a/maven-surefire.spec b/maven-surefire.spec
index 9a237c4..d758d3a 100644
--- a/maven-surefire.spec
+++ b/maven-surefire.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package maven-surefire
 #
-# 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
@@ -22,7 +22,7 @@ Release:        0
 Summary:        Test framework project
 License:        Apache-2.0 AND CPL-1.0
 Group:          Development/Libraries/Java
-URL:            http://maven.apache.org/surefire/
+URL:            https://maven.apache.org/surefire/
 # ./generate-tarball.sh
 Source0:        %{name}-%{version}.tar.gz
 # Remove bundled binaries which cannot be easily verified for licensing
@@ -38,6 +38,7 @@ BuildRequires:  ant
 BuildRequires:  apache-commons-io
 BuildRequires:  apache-commons-lang3
 BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  javacc
 BuildRequires:  javapackages-local
 BuildRequires:  jsr-305
@@ -213,12 +214,12 @@ build-jar-repository -s -p lib \
 	plexus-languages/plexus-java \
 	testng
 
-%ant \
+%{ant} \
 	-Dtest.skip=true \
 	package javadoc
 
-%mvn_artifact pom.xml
-%mvn_artifact surefire-providers/pom.xml
+%{mvn_artifact} pom.xml
+%{mvn_artifact} surefire-providers/pom.xml
 
 mkdir -p target/site/apidocs
 
@@ -232,7 +233,7 @@ for module in \
     maven-surefire-plugin \
     maven-failsafe-plugin \
     maven-surefire-report-plugin; do
-  %mvn_artifact ${module}/pom.xml ${module}/target/${module}-%{version}.jar
+  %{mvn_artifact} ${module}/pom.xml ${module}/target/${module}-%{version}.jar
   if [ -d ${module}/target/site/apidocs ]; then
     cp -r ${module}/target/site/apidocs target/site/apidocs/${module}
   fi
@@ -247,7 +248,7 @@ for module in \
     surefire-junit47 \
     surefire-testng-utils \
     surefire-testng; do
-  %mvn_artifact surefire-providers/${module}/pom.xml \
+  %{mvn_artifact} surefire-providers/${module}/pom.xml \
     surefire-providers/${module}/target/${module}-%{version}.jar
   if [ -d surefire-providers/${module}/target/site/apidocs ]; then
     cp -r surefire-providers/${module}/target/site/apidocs target/site/apidocs/${module}