Update to 6.9.5

.gitignore

@@ -1,4 +1,3 @@
-testng-5.11.zip
 /testng-6.0.1.tar.xz
 /testng-6.8.tar.gz
 /testng-6.8.5.tar.gz
@@ -7,3 +6,4 @@ testng-5.11.zip
 /testng-6.8.14.tar.gz
 /testng-6.8.17.tar.gz
 /testng-6.8.21.tar.gz
+/testng-6.9.5.tar.gz

sources

@@ -1 +1 @@
-6d2331958850922796329a9d9e141e02  testng-6.8.21.tar.gz
+acfcadb5d16c5d7a317d1af0890ab1b4  testng-6.9.5.tar.gz

testng.spec

@@ -2,27 +2,26 @@
 %global group_id  org.testng
 
 Name:             testng
-Version:          6.8.21
-Release:          2%{?dist}
+Version:          6.9.5
+Release:          1%{?dist}
 Summary:          Java-based testing framework
 # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL
 License:          ASL 2.0 and CPL
 URL:              http://testng.org/
-Source0:          https://github.com/cbeust/testng/archive/%{name}-%{version}.tar.gz
+Source0:          https://github.com/cbeust/testng/archive/testng-%{version}.tar.gz
 
 BuildArch:        noarch
 
-BuildRequires:    mvn(com.beust:jcommander) >= 1.27
-BuildRequires:    mvn(com.google.guava:guava)
-BuildRequires:    mvn(com.google.inject:guice)
-BuildRequires:    mvn(junit:junit)
-BuildRequires:    mvn(org.apache.ant:ant)
-BuildRequires:    mvn(org.beanshell:bsh)
-BuildRequires:    mvn(org.sonatype.oss:oss-parent:pom:)
-BuildRequires:    mvn(org.yaml:snakeyaml)
-
-BuildRequires:    maven-local
-BuildRequires:    maven-plugin-bundle
+BuildRequires:  maven-local
+BuildRequires:  mvn(com.beust:jcommander)
+BuildRequires:  mvn(com.google.inject:guice::no_aop:)
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.ant:ant)
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.beanshell:bsh)
+BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
+BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)
+BuildRequires:  mvn(org.yaml:snakeyaml)
 
 %description
 TestNG is a testing framework inspired from JUnit and NUnit but introducing
@@ -39,51 +38,45 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n %{name}-%{name}-%{version}
 
-# build fix for new guice
-%pom_add_dep com.google.guava:guava::provided
-sed -i "s|com.google.inject.internal|com.google.common.collect|" \
-  src/main/java/org/testng/xml/XmlDependencies.java \
-  src/main/java/org/testng/xml/XmlGroups.java \
-  src/main/java/org/testng/xml/dom/TestNGTagFactory.java \
-  src/test/java/test/dependent/InstanceSkipSampleTest.java \
-  src/test/java/test/mustache/MustacheTest.java \
-  src/test/java/test/thread/B.java
+# remove any bundled libs
+find -name *.jar -delete
+find -name *.class -delete
 
+# these are unnecessary
 %pom_remove_plugin :maven-gpg-plugin
 %pom_remove_plugin :maven-source-plugin
-  
-# remove bundled stuff
-rm -rf spring
-rm -rf 3rdparty
-rm -rf lib-supplied
-rm -rf gigaspaces
-rm -f *.jar
+%pom_remove_plugin :maven-javadoc-plugin
 
-# convert to UTF-8
-native2ascii -encoding UTF-8 src/main/java/org/testng/internal/Version.java \
-  src/main/java/org/testng/internal/Version.java
+# test deps not in Fedora
+%pom_remove_dep org.assertj:assertj-core
 
-iconv --from-code=ISO-8859-2 --to-code=UTF-8 ANNOUNCEMENT.txt > ANNOUNCEMENT.txt.utf8
-mv -f ANNOUNCEMENT.txt.utf8 ANNOUNCEMENT.txt
+# plugins not in Fedora
+%pom_remove_plugin com.coderplus.maven.plugins:copy-rename-maven-plugin
+sed -i -e 's/VersionTemplateJava/Version.java/' pom.xml
+mv ./src/main/resources/org/testng/internal/VersionTemplateJava ./src/main/resources/org/testng/internal/Version.java
 
 %mvn_file : %{name}
 # jdk15 classifier is used by some other packages
 %mvn_alias : :::jdk15:
 
 %build
-%mvn_build -- -Dmaven.local.debug=true
+# TODO build tests when assetj-core becomes available
+%mvn_build -f -- -Dmaven.local.debug=true
 
 %install
 %mvn_install
 
 %files -f .mfiles
-%doc ANNOUNCEMENT.txt CHANGES.txt README
+%doc CHANGES.txt README.md
 %license LICENSE.txt
 
 %files javadoc -f .mfiles-javadoc
 %license LICENSE.txt
 
 %changelog
+* Mon Sep 07 2015 Mat Booth <mat.booth@redhat.com> - 6.9.5-1
+- Update to 6.9.5
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.8.21-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild