diff --git a/maven-surefire.spec b/maven-surefire.spec
index 1e28a46..1c3ac38 100644
--- a/maven-surefire.spec
+++ b/maven-surefire.spec
@@ -1,6 +1,6 @@
 Name:           maven-surefire
 Version:        3.0.0~M3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Test framework project
 License:        ASL 2.0 and CPL
 URL:            http://maven.apache.org/surefire/
@@ -16,34 +16,36 @@ Patch1:         0001-Port-to-TestNG-6.11.patch
 Patch2:         0002-Port-to-current-maven-shared-utils.patch
 
 BuildRequires:  maven-local
-BuildRequires:  maven-assembly-plugin
-BuildRequires:  maven-toolchain
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
 BuildRequires:  mvn(commons-io:commons-io)
+BuildRequires:  mvn(commons-lang:commons-lang)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.commons:commons-lang3)
+BuildRequires:  mvn(org.apache.maven.doxia:doxia-core)
+BuildRequires:  mvn(org.apache.maven.doxia:doxia-decoration-model)
+BuildRequires:  mvn(org.apache.maven.doxia:doxia-sink-api)
 BuildRequires:  mvn(org.apache.maven.doxia:doxia-site-renderer)
+BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-assembly-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-dependency-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-failsafe-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-shade-plugin)
+BuildRequires:  mvn(org.apache.maven.reporting:maven-reporting-api)
+BuildRequires:  mvn(org.apache.maven.reporting:maven-reporting-impl)
+BuildRequires:  mvn(org.apache.maven.shared:maven-common-artifact-filters)
+BuildRequires:  mvn(org.apache.maven.shared:maven-shared-utils)
 BuildRequires:  mvn(org.apache.maven:maven-artifact)
 BuildRequires:  mvn(org.apache.maven:maven-core)
 BuildRequires:  mvn(org.apache.maven:maven-model)
 BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-dependency-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-failsafe-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-invoker-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-shade-plugin)
-BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
-BuildRequires:  mvn(org.apache.maven.reporting:maven-reporting-api)
-BuildRequires:  mvn(org.apache.maven.reporting:maven-reporting-impl)
-BuildRequires:  mvn(org.apache.maven.shared:maven-common-artifact-filters)
-BuildRequires:  mvn(org.apache.maven.shared:maven-shared-utils)
-BuildRequires:  mvn(org.apache.maven.shared:maven-verifier)
+BuildRequires:  mvn(org.apache.maven:maven-toolchain)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 BuildRequires:  mvn(org.codehaus.mojo:javacc-maven-plugin)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-java)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 BuildRequires:  mvn(org.fusesource.jansi:jansi)
+BuildRequires:  mvn(org.junit.platform:junit-platform-launcher)
 BuildRequires:  mvn(org.testng:testng)
 BuildRequires:  mvn(org.testng:testng::jdk15:)
 
@@ -72,6 +74,11 @@ Summary:                JUnit provider for Maven Surefire
 %description provider-junit
 JUnit provider for Maven Surefire.
 
+%package provider-junit5
+Summary:                JUnit 5 provider for Maven Surefire
+
+%description provider-junit5
+JUnit 5 provider for Maven Surefire.
 
 %package provider-testng
 Summary:                TestNG provider for Maven Surefire
@@ -123,8 +130,6 @@ sed -i /-Xdoclint:all/d pom.xml
 
 %pom_disable_module surefire-shadefire
 
-%pom_disable_module surefire-junit-platform surefire-providers
-
 %pom_remove_dep -r org.apache.maven.surefire:surefire-shadefire
 
 # Help plugin is needed only to evaluate effective Maven settings.
@@ -150,8 +155,7 @@ sed -i /-Xdoclint:all/d pom.xml
 %mvn_package ":*{junit,testng,failsafe-plugin,report-parser}*"  @1
 %mvn_package ":*tests*" __noinstall
 # tests turned off because they need jmock
-# use xmvn-javadoc because maven-javadoc-plugin crashes JVM
-%mvn_build -X -f -j -G org.fedoraproject.xmvn:xmvn-mojo:javadoc
+%mvn_build -f
 
 %install
 %mvn_install
@@ -165,6 +169,7 @@ sed -i /-Xdoclint:all/d pom.xml
 %files report-plugin -f .mfiles-report-plugin
 %files report-parser -f .mfiles-report-parser
 %files provider-junit -f .mfiles-junit
+%files provider-junit5 -f .mfiles-junit5
 %files provider-testng -f .mfiles-testng
 %files -n maven-failsafe-plugin -f .mfiles-failsafe-plugin
 
@@ -172,6 +177,9 @@ sed -i /-Xdoclint:all/d pom.xml
 %license LICENSE NOTICE cpl-v10.html
 
 %changelog
+* Mon Oct 28 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M3-3
+- Enable JUnit 5 provider
+
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M3-2
 - Mass rebuild for javapackages-tools 201901