diff --git a/.gitignore b/.gitignore
index 838c80e..9c623c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+/noarch/
+/.build-*.log
+/*.src.rpm
/testng-6.0.1.tar.xz
/testng-6.8.tar.gz
/testng-6.8.5.tar.gz
@@ -11,3 +14,4 @@
/6.9.9.tar.gz
/6.9.10.tar.gz
/6.9.11.tar.gz
+/6.9.12.tar.gz
diff --git a/sources b/sources
index db4f285..a6c1768 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2364b55f3cd4973604355c65c72165ee 6.9.11.tar.gz
+00f1b9b2bf82ee854e9ec0ddbccfab2e 6.9.12.tar.gz
diff --git a/testng.spec b/testng.spec
index 7db72d5..d97b03e 100644
--- a/testng.spec
+++ b/testng.spec
@@ -1,8 +1,5 @@
-
-%global group_id org.testng
-
Name: testng
-Version: 6.9.11
+Version: 6.9.12
Release: 1%{?dist}
Summary: Java-based testing framework
# org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL
@@ -20,8 +17,11 @@ BuildRequires: mvn(org.apache.ant:ant)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.assertj:assertj-core)
BuildRequires: mvn(org.beanshell:bsh)
+BuildRequires: mvn(org.codehaus.gmavenplus:gmavenplus-plugin)
+BuildRequires: mvn(org.codehaus.groovy:groovy-all)
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
+BuildRequires: mvn(org.spockframework:spock-core)
BuildRequires: mvn(org.yaml:snakeyaml)
%description
@@ -48,6 +48,15 @@ find -name *.class -delete
%pom_remove_plugin :maven-source-plugin
%pom_remove_plugin :maven-javadoc-plugin
+# missing test deps
+%pom_add_plugin "org.codehaus.gmavenplus:gmavenplus-plugin" pom.xml \
+ "addTestSourcestestGenerateStubstestCompileremoveTestStubs"
+%pom_add_dep "org.spockframework:spock-core::test"
+%pom_add_dep "org.codehaus.groovy:groovy-all::test"
+
+# avoid SNAPSHOT in version number
+sed -i -e '//s/-SNAPSHOT//' pom.xml
+
# plugins not in Fedora
%pom_remove_plugin com.coderplus.maven.plugins:copy-rename-maven-plugin
sed -i -e 's/VersionTemplateJava/Version.java/' pom.xml
@@ -61,7 +70,6 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
%mvn_alias : :::jdk15:
%build
-
%mvn_build -- -Dmaven.local.debug=true
%install
@@ -75,6 +83,10 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
%license LICENSE.txt
%changelog
+* Tue Nov 01 2016 Mat Booth - 6.9.12-1
+- Update to upstream version 6.9.12
+- Avoid 'SNAPSHOT' in pom version to fix tests in testng-remote package
+
* Wed Apr 20 2016 Mikolaj Izdebski - 6.9.11-1
- Update to upstream version 6.9.11