From b471652440d6d78817d54931b3642bd281402247 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 19 Jul 2010 09:35:09 +0000 Subject: [PATCH 001/109] - Drop backport util concurrent dependency, we don't build jdk14 jar --- testng.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testng.spec b/testng.spec index ec62328..bfd430b 100644 --- a/testng.spec +++ b/testng.spec @@ -1,6 +1,6 @@ Name: testng Version: 5.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java-based testing framework Group: Development/Tools @@ -20,7 +20,6 @@ BuildRequires: jpackage-utils BuildRequires: java-devel-openjdk BuildRequires: bsh BuildRequires: qdox -BuildRequires: backport-util-concurrent BuildRequires: junit Requires: jpackage-utils @@ -51,7 +50,7 @@ JavaDoc documentation for %{name} %build find -name '*.jar' -delete -CLASSPATH=$(build-classpath bsh qdox backport-util-concurrent junit) \ +CLASSPATH=$(build-classpath bsh qdox junit) \ ant dist-15 javadocs # Convert CP/M line encoding to UNIX one @@ -107,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 19 2010 Lubomir Rintel - 5.11-3 +- Drop backport util concurrent dependency, we don't build jdk14 jar + * Mon Dec 21 2009 Lubomir Rintel - 5.11-2 - Add POM From 39b3b079a9542769c1528fc96858b05752d7f441 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:04:06 +0000 Subject: [PATCH 002/109] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 117b713..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: testng -# $Id$ -NAME := testng -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 9649bd111c8741a36ea1689f223ededa4a1c0d38 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 12:48:34 -0600 Subject: [PATCH 003/109] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- testng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testng.spec b/testng.spec index bfd430b..d66b7b0 100644 --- a/testng.spec +++ b/testng.spec @@ -1,6 +1,6 @@ Name: testng Version: 5.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java-based testing framework Group: Development/Tools @@ -106,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 09 2011 Fedora Release Engineering - 5.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Jul 19 2010 Lubomir Rintel - 5.11-3 - Drop backport util concurrent dependency, we don't build jdk14 jar From a1ad30592edcc92dbb88f3aab6b94675dec0b69f Mon Sep 17 00:00:00 2001 From: Jaromir Capik Date: Wed, 22 Jun 2011 23:11:42 +0300 Subject: [PATCH 004/109] Update to 6.0.1 --- .gitignore | 1 + 0001-Disable-DTDDoc-target.patch | 39 ------ 0001-Do-not-bundle-prebuilt-jar-s.patch | 44 ------- 0001-Port-to-QDoc-1.9.patch | 43 ------ sources | 2 +- testng-5.11.pom | 58 -------- testng-test-fails-workaround.patch | 12 ++ testng.depmap | 12 ++ testng.spec | 167 +++++++++++++----------- 9 files changed, 118 insertions(+), 260 deletions(-) delete mode 100644 0001-Disable-DTDDoc-target.patch delete mode 100644 0001-Do-not-bundle-prebuilt-jar-s.patch delete mode 100644 0001-Port-to-QDoc-1.9.patch delete mode 100644 testng-5.11.pom create mode 100644 testng-test-fails-workaround.patch create mode 100644 testng.depmap diff --git a/.gitignore b/.gitignore index a24dc32..1baa115 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ testng-5.11.zip +/testng-6.0.1.tar.xz diff --git a/0001-Disable-DTDDoc-target.patch b/0001-Disable-DTDDoc-target.patch deleted file mode 100644 index ddd0518..0000000 --- a/0001-Disable-DTDDoc-target.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 770133c22ac56be30115f33a904e8d590e0c0cda Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Fri, 27 Nov 2009 14:46:16 +0100 -Subject: [PATCH 2/4] Disable DTDDoc target - -We do not ship DTDDoc yet. ---- - build.xml | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/build.xml b/build.xml -index 832b36b..71af78b 100644 ---- a/build.xml -+++ b/build.xml -@@ -371,17 +371,17 @@ - - - -- -+ - - -- - -- -+ - - - --- -1.6.5.2 - diff --git a/0001-Do-not-bundle-prebuilt-jar-s.patch b/0001-Do-not-bundle-prebuilt-jar-s.patch deleted file mode 100644 index b3648d5..0000000 --- a/0001-Do-not-bundle-prebuilt-jar-s.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4bc2dd4f10a7cca628af7c9c8aac6fe3b3d5ad27 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Fri, 27 Nov 2009 14:46:15 +0100 -Subject: [PATCH 1/4] Do not bundle prebuilt jar-s - ---- - build.xml | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/build.xml b/build.xml -index 683100d..832b36b 100644 ---- a/build.xml -+++ b/build.xml -@@ -243,21 +243,21 @@ - - - -- -+ overwrite="true" /--> - - - -- -+ overwrite="true" /--> - - - -- -+ overwrite="true" /--> - - - --- -1.6.5.2 - diff --git a/0001-Port-to-QDoc-1.9.patch b/0001-Port-to-QDoc-1.9.patch deleted file mode 100644 index e1ed7ba..0000000 --- a/0001-Port-to-QDoc-1.9.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 02af5468f942e91ddbbbafab7256124b1e72b013 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Fri, 27 Nov 2009 14:46:16 +0100 -Subject: [PATCH 3/4] Port to QDoc 1.9 - ---- - .../testng/internal/AnnotationTestConverter.java | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/main/org/testng/internal/AnnotationTestConverter.java b/src/main/org/testng/internal/AnnotationTestConverter.java -index 539592b..d024e9f 100644 ---- a/src/main/org/testng/internal/AnnotationTestConverter.java -+++ b/src/main/org/testng/internal/AnnotationTestConverter.java -@@ -115,7 +115,7 @@ public class AnnotationTestConverter { - Class annotationClass= m_annotationMap.get(tag.getName()); - if(annotationClass == null) { - ppp("Found unknown testng annotation " + tag.getName() + " in file " -- + tag.getContext().getSource().getFile().getAbsolutePath() + " at line " -+ + tag.getContext().getParent().getParentSource().getFile().getAbsolutePath() + " at line " - + tag.getLineNumber()); - - // preserve the information - but it looks like an invalid tag -@@ -128,7 +128,7 @@ public class AnnotationTestConverter { - } - catch(Exception e) { - ppp("Found unknown testng parameter " + key + " in annotation " + tag.getName() + " in file " -- + tag.getContext().getSource().getFile().getAbsolutePath() + " at line " -+ + tag.getContext().getParent().getParentSource().getFile().getAbsolutePath() + " at line " - + tag.getLineNumber()); - - // preserve the information - but it looks like an invalid parameter -@@ -279,7 +279,7 @@ public class AnnotationTestConverter { - - if(finalLines.size() > lineCount) { - ppp("Writing file " + file.getAbsolutePath()); -- writeFile(file, source.getPackage(), finalLines); -+ writeFile(file, source.getPackage().getName(), finalLines); - converted++; - } - } --- -1.6.5.2 - diff --git a/sources b/sources index 9d4f0c4..b6e86e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2c3539788100b56ddec1e78c6d5b73d8 testng-5.11.zip +a861651088aa47a7a350bdfaf0a824ae testng-6.0.1.tar.xz diff --git a/testng-5.11.pom b/testng-5.11.pom deleted file mode 100644 index 47196fd..0000000 --- a/testng-5.11.pom +++ /dev/null @@ -1,58 +0,0 @@ - - - 4.0.0 - org.testng - testng - TestNG - 5.11 - TestNG is a testing framework inspired from JUnit and NUnit but introducing some new functionalities that make it more powerful and easier to use. - http://testng.org - - - - Apache License, Version 2.0 - http://apache.org/licenses/LICENSE-2.0 - - - - - scm:svn:http://testng.googlecode.com/svn/trunk/ - scm:svn:http://testng.googlecode.com/svn/trunk/ - http://testng.googlecode.com/svn/trunk - - - - - ant - ant - 1.6.5 - true - - - junit - junit - 3.8.1 - - - qdox - qdox - 1.6.1 - provided - - - org.beanshell - bsh - 2.0b4 - provided - - - - diff --git a/testng-test-fails-workaround.patch b/testng-test-fails-workaround.patch new file mode 100644 index 0000000..7a9dac8 --- /dev/null +++ b/testng-test-fails-workaround.patch @@ -0,0 +1,12 @@ +diff -Naur testng-6.0.1.orig/src/test/java/test/junit/Suite2.java testng-6.0.1/src/test/java/test/junit/Suite2.java +--- testng-6.0.1.orig/src/test/java/test/junit/Suite2.java 2011-03-24 21:09:34.000000000 +0100 ++++ testng-6.0.1/src/test/java/test/junit/Suite2.java 2011-06-01 18:50:24.260159540 +0200 +@@ -8,7 +8,7 @@ + TestSuite suite = new TestSuite("Suite2"); + suite.addTestSuite(TestAc.class); + suite.addTestSuite(TestAd.class); +- suite.addTestSuite(Suite3.class); ++// suite.addTestSuite(Suite3.class); + return suite; + } + } diff --git a/testng.depmap b/testng.depmap new file mode 100644 index 0000000..2571680 --- /dev/null +++ b/testng.depmap @@ -0,0 +1,12 @@ + + + + com.google.gdata + gdata-core + + + JPP + gdata/gdata-core + + + diff --git a/testng.spec b/testng.spec index d66b7b0..36203d4 100644 --- a/testng.spec +++ b/testng.spec @@ -1,29 +1,35 @@ -Name: testng -Version: 5.11 -Release: 4%{?dist} -Summary: Java-based testing framework -Group: Development/Tools -License: ASL 2.0 -URL: http://testng.org/ -Source0: http://testng.org/%{name}-%{version}.zip -Source1: http://repo2.maven.org/maven2/org/testng/testng/%{version}/testng-%{version}.pom -Patch0: 0001-Do-not-bundle-prebuilt-jar-s.patch -Patch1: 0001-Disable-DTDDoc-target.patch -Patch2: 0001-Port-to-QDoc-1.9.patch +%global group_id org.testng -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +Name: testng +Version: 6.0.1 +Release: 1%{?dist} +Summary: Java-based testing framework +License: ASL 2.0 +Group: Development/Libraries +URL: http://testng.org/ +# git clone git://github.com/cbeust/testng.git +# cd testng +# git archive --prefix="testng-6.0.1/" --format=tar testng-6.0.1 | xz > testng-6.0.1.tar.xz +Source0: %{name}-%{version}.tar.xz +Source1: %{name}.depmap -BuildRequires: ant -BuildRequires: unzip -BuildRequires: jpackage-utils -BuildRequires: java-devel-openjdk -BuildRequires: bsh -BuildRequires: qdox -BuildRequires: junit -Requires: jpackage-utils +Patch0: %{name}-test-fails-workaround.patch -BuildArch: noarch +BuildArch: noarch + +BuildRequires: java-devel +BuildRequires: jpackage-utils +BuildRequires: maven +BuildRequires: beust-jcommander +BuildRequires: snakeyaml + +Requires: beust-jcommander +Requires: snakeyaml +Requires: java +Requires: jpackage-utils +Requires(post): jpackage-utils +Requires(postun): jpackage-utils %description TestNG is a testing framework inspired from JUnit and NUnit but introducing @@ -31,81 +37,92 @@ some new functionality, including flexible test configuration, and distributed test running. It is designed to cover unit tests as well as functional, end-to-end, integration, etc. - %package javadoc -Summary: API Documentation for %{name} -Group: Development/Tools -Requires: jpackage-utils +Summary: API documentation for %{name} +Group: Documentation +Requires: jpackage-utils %description javadoc -JavaDoc documentation for %{name} - +This package contains the API documentation for %{name}. %prep %setup -q -%patch0 -p1 -b .nobundle -%patch1 -p1 -b .dtddoc -%patch2 -p1 -b .qdoc19 +%patch0 -p1 + +# remove bundled stuff +rm -rf spring +rm -rf 3rdparty +rm -rf doc +rm -rf lib-supplied +rm -rf gigaspaces +rm -rf sandbox +rm -rf examples +rm -f *.jar + + +# fix the ant group_id ... ant -> org.apache.ant +sed -i 's/ant/org.apache.ant/g' pom.xml + +# replace CR+LF with LF +sed -i 's/\r//g' README + +# convert to UTF8 + +#$ enca CHANGES.txt +#Unrecognized encoding +#$ enca ANNOUNCEMENT.txt +#Unrecognized encoding + +#$ chardet-file ANNOUNCEMENT.txt +#{'confidence': 0.8484260688832136, 'encoding': 'ISO-8859-2'} +#$ chardet-file CHANGES.txt +#{'confidence': 0.7833420201466339, 'encoding': 'ISO-8859-2'} + +iconv --from-code=ISO-8859-2 --to-code=UTF-8 ANNOUNCEMENT.txt > ANNOUNCEMENT.txt.utf8 +mv -f ANNOUNCEMENT.txt.utf8 ANNOUNCEMENT.txt +iconv --from-code=ISO-8859-2 --to-code=UTF-8 CHANGES.txt > CHANGES.txt.utf8 +mv -f CHANGES.txt.utf8 CHANGES.txt %build -find -name '*.jar' -delete -CLASSPATH=$(build-classpath bsh qdox junit) \ - ant dist-15 javadocs - -# Convert CP/M line encoding to UNIX one -sed 's/\r//' README.unix -touch -r README README.unix -mv README.unix README - +# gdata-java has no maven support -> depmap file needed +# http://code.google.com/p/gdata-java-client/issues/detail?id=328 +mvn-rpmbuild -Dmaven.local.depmap.file="%{SOURCE1}" -Dgpg.skip=true install javadoc:aggregate %install -rm -rf $RPM_BUILD_ROOT +# jars +install -d -m 755 %{buildroot}%{_javadir} +install -p -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar -# Code -install -d $RPM_BUILD_ROOT%{_javadir} -install -pm644 %{name}-%{version}-jdk15.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -ln -s %{name}-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}.jar - -# API documentation -install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -a javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} - -# Maven stuff -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms -install -pm 644 %{SOURCE1} \ - $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom -%add_to_maven_depmap org.%{name} %{name} %{version} JPP %{name} - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root,-) -%{_javadir}/* -%{_sysconfdir}/maven/fragments -%{_datadir}/maven2 -%doc CHANGES.txt README LICENSE.txt - - -%files javadoc -%defattr(-,root,root,-) -%{_javadocdir}/* +# pom +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +%add_to_maven_depmap %{group_id} %{name} %{version} JPP %{name} +# javadoc +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %post %update_maven_depmap - %postun %update_maven_depmap +%files +%doc LICENSE.txt ANNOUNCEMENT.txt CHANGES.txt README +%{_javadir}/%{name}.jar +%{_mavenpomdir}/JPP-%{name}.pom +%{_mavendepmapfragdir}/%{name} + +%files javadoc +%doc LICENSE.txt +%doc %{_javadocdir}/%{name} %changelog +* Thu May 12 2011 Jaromir Capik - 6.0.1-1 +- Update to 6.0.1 + * Wed Feb 09 2011 Fedora Release Engineering - 5.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 54cd4b2d34a6083527d1902960add671a36ed5dc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 00:35:13 -0600 Subject: [PATCH 005/109] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- testng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testng.spec b/testng.spec index 36203d4..e65a168 100644 --- a/testng.spec +++ b/testng.spec @@ -3,7 +3,7 @@ Name: testng Version: 6.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java-based testing framework License: ASL 2.0 Group: Development/Libraries @@ -120,6 +120,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %doc %{_javadocdir}/%{name} %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 6.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Thu May 12 2011 Jaromir Capik - 6.0.1-1 - Update to 6.0.1 From 12ffcad884a2a731b00d631dcbdb4b6d8da59fc8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 18:16:33 -0500 Subject: [PATCH 006/109] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- testng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testng.spec b/testng.spec index e65a168..ee018fa 100644 --- a/testng.spec +++ b/testng.spec @@ -3,7 +3,7 @@ Name: testng Version: 6.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java-based testing framework License: ASL 2.0 Group: Development/Libraries @@ -120,6 +120,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %doc %{_javadocdir}/%{name} %changelog +* Sat Jul 21 2012 Fedora Release Engineering - 6.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 6.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 51250f6df2896c8440fb3e1852d52484ed5ff4e7 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Thu, 26 Jul 2012 16:58:28 +0200 Subject: [PATCH 007/109] Spec file cleanups and add_maven_depmap macro use - Drop no longer needed depmap --- testng.depmap | 12 ------------ testng.spec | 21 +++++++-------------- 2 files changed, 7 insertions(+), 26 deletions(-) delete mode 100644 testng.depmap diff --git a/testng.depmap b/testng.depmap deleted file mode 100644 index 2571680..0000000 --- a/testng.depmap +++ /dev/null @@ -1,12 +0,0 @@ - - - - com.google.gdata - gdata-core - - - JPP - gdata/gdata-core - - - diff --git a/testng.spec b/testng.spec index ee018fa..9468fa4 100644 --- a/testng.spec +++ b/testng.spec @@ -3,7 +3,7 @@ Name: testng Version: 6.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java-based testing framework License: ASL 2.0 Group: Development/Libraries @@ -12,7 +12,6 @@ URL: http://testng.org/ # cd testng # git archive --prefix="testng-6.0.1/" --format=tar testng-6.0.1 | xz > testng-6.0.1.tar.xz Source0: %{name}-%{version}.tar.xz -Source1: %{name}.depmap Patch0: %{name}-test-fails-workaround.patch @@ -28,8 +27,6 @@ Requires: beust-jcommander Requires: snakeyaml Requires: java Requires: jpackage-utils -Requires(post): jpackage-utils -Requires(postun): jpackage-utils %description TestNG is a testing framework inspired from JUnit and NUnit but introducing @@ -85,9 +82,7 @@ iconv --from-code=ISO-8859-2 --to-code=UTF-8 CHANGES.txt > CHANGES.txt.utf8 mv -f CHANGES.txt.utf8 CHANGES.txt %build -# gdata-java has no maven support -> depmap file needed -# http://code.google.com/p/gdata-java-client/issues/detail?id=328 -mvn-rpmbuild -Dmaven.local.depmap.file="%{SOURCE1}" -Dgpg.skip=true install javadoc:aggregate +mvn-rpmbuild -Dmaven.local.debug=true -Dgpg.skip=true install javadoc:aggregate %install # jars @@ -97,18 +92,12 @@ install -p -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}. # pom install -d -m 755 %{buildroot}%{_mavenpomdir} install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_to_maven_depmap %{group_id} %{name} %{version} JPP %{name} +%add_maven_depmap # javadoc install -d -m 755 %{buildroot}%{_javadocdir}/%{name} cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} -%post -%update_maven_depmap - -%postun -%update_maven_depmap - %files %doc LICENSE.txt ANNOUNCEMENT.txt CHANGES.txt README %{_javadir}/%{name}.jar @@ -120,6 +109,10 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %doc %{_javadocdir}/%{name} %changelog +* Thu Jul 26 2012 Stanislav Ochotnicky - 6.0.1-4 +- Spec file cleanups and add_maven_depmap macro use +- Drop no longer needed depmap + * Sat Jul 21 2012 Fedora Release Engineering - 6.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 053a3e4008b58cddf854d53fedbce6b2de706899 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Thu, 8 Nov 2012 17:41:42 +0100 Subject: [PATCH 008/109] Part of testng is CPL, add it to license tag --- testng.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/testng.spec b/testng.spec index 9468fa4..4ec9a20 100644 --- a/testng.spec +++ b/testng.spec @@ -3,9 +3,10 @@ Name: testng Version: 6.0.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java-based testing framework -License: ASL 2.0 +# .../remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL +License: ASL 2.0 and CPL Group: Development/Libraries URL: http://testng.org/ # git clone git://github.com/cbeust/testng.git @@ -109,6 +110,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %doc %{_javadocdir}/%{name} %changelog +* Thu Nov 08 2012 Stanislav Ochotnicky - 6.0.1-5 +- Part of testng is CPL, add it to license tag + * Thu Jul 26 2012 Stanislav Ochotnicky - 6.0.1-4 - Spec file cleanups and add_maven_depmap macro use - Drop no longer needed depmap From 9be560a46f37523730c553dfeb1f6f9a4e740e93 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Wed, 6 Feb 2013 20:46:15 +0100 Subject: [PATCH 009/109] - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires with maven-local --- testng.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/testng.spec b/testng.spec index 4ec9a20..4365bd3 100644 --- a/testng.spec +++ b/testng.spec @@ -3,7 +3,7 @@ Name: testng Version: 6.0.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java-based testing framework # .../remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL License: ASL 2.0 and CPL @@ -20,7 +20,7 @@ BuildArch: noarch BuildRequires: java-devel BuildRequires: jpackage-utils -BuildRequires: maven +BuildRequires: maven-local BuildRequires: beust-jcommander BuildRequires: snakeyaml @@ -110,6 +110,10 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %doc %{_javadocdir}/%{name} %changelog +* Wed Feb 06 2013 Java SIG - 6.0.1-6 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + * Thu Nov 08 2012 Stanislav Ochotnicky - 6.0.1-5 - Part of testng is CPL, add it to license tag From 7ac0586f8f68ea25203439646580f5f5339a8d79 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sun, 10 Feb 2013 18:13:58 +0000 Subject: [PATCH 010/109] Update to latest upstream release, 6.8 --- .gitignore | 1 + sources | 2 +- testng-test-fails-workaround.patch | 12 ------ testng.spec | 65 ++++++++++++------------------ 4 files changed, 28 insertions(+), 52 deletions(-) delete mode 100644 testng-test-fails-workaround.patch diff --git a/.gitignore b/.gitignore index 1baa115..19f7017 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ testng-5.11.zip /testng-6.0.1.tar.xz +/testng-6.8.tar.gz diff --git a/sources b/sources index b6e86e0..fb1a809 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a861651088aa47a7a350bdfaf0a824ae testng-6.0.1.tar.xz +7a61453eed2218d4f905fe8c7d4f9501 testng-6.8.tar.gz diff --git a/testng-test-fails-workaround.patch b/testng-test-fails-workaround.patch deleted file mode 100644 index 7a9dac8..0000000 --- a/testng-test-fails-workaround.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur testng-6.0.1.orig/src/test/java/test/junit/Suite2.java testng-6.0.1/src/test/java/test/junit/Suite2.java ---- testng-6.0.1.orig/src/test/java/test/junit/Suite2.java 2011-03-24 21:09:34.000000000 +0100 -+++ testng-6.0.1/src/test/java/test/junit/Suite2.java 2011-06-01 18:50:24.260159540 +0200 -@@ -8,7 +8,7 @@ - TestSuite suite = new TestSuite("Suite2"); - suite.addTestSuite(TestAc.class); - suite.addTestSuite(TestAd.class); -- suite.addTestSuite(Suite3.class); -+// suite.addTestSuite(Suite3.class); - return suite; - } - } diff --git a/testng.spec b/testng.spec index 4365bd3..260c16a 100644 --- a/testng.spec +++ b/testng.spec @@ -2,32 +2,29 @@ %global group_id org.testng Name: testng -Version: 6.0.1 -Release: 6%{?dist} +Version: 6.8 +Release: 1%{?dist} Summary: Java-based testing framework -# .../remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL +# org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL License: ASL 2.0 and CPL Group: Development/Libraries URL: http://testng.org/ -# git clone git://github.com/cbeust/testng.git -# cd testng -# git archive --prefix="testng-6.0.1/" --format=tar testng-6.0.1 | xz > testng-6.0.1.tar.xz -Source0: %{name}-%{version}.tar.xz - -Patch0: %{name}-test-fails-workaround.patch +Source0: https://github.com/cbeust/testng/archive/%{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: java-devel BuildRequires: jpackage-utils BuildRequires: maven-local -BuildRequires: beust-jcommander +BuildRequires: beust-jcommander >= 1.27 BuildRequires: snakeyaml +BuildRequires: google-guice -Requires: beust-jcommander -Requires: snakeyaml Requires: java Requires: jpackage-utils +Requires: beust-jcommander >= 1.27 +Requires: snakeyaml +Requires: google-guice %description TestNG is a testing framework inspired from JUnit and NUnit but introducing @@ -44,43 +41,30 @@ Requires: jpackage-utils This package contains the API documentation for %{name}. %prep -%setup -q +%setup -q -n %{name}-%{name}-%{version} -%patch0 -p1 +# build fix for new guice +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 bundled stuff rm -rf spring rm -rf 3rdparty -rm -rf doc rm -rf lib-supplied rm -rf gigaspaces -rm -rf sandbox -rm -rf examples rm -f *.jar - -# fix the ant group_id ... ant -> org.apache.ant -sed -i 's/ant/org.apache.ant/g' pom.xml - -# replace CR+LF with LF -sed -i 's/\r//g' README - -# convert to UTF8 - -#$ enca CHANGES.txt -#Unrecognized encoding -#$ enca ANNOUNCEMENT.txt -#Unrecognized encoding - -#$ chardet-file ANNOUNCEMENT.txt -#{'confidence': 0.8484260688832136, 'encoding': 'ISO-8859-2'} -#$ chardet-file CHANGES.txt -#{'confidence': 0.7833420201466339, 'encoding': 'ISO-8859-2'} +# convert to UTF-8 +native2ascii -encoding UTF-8 src/main/java/org/testng/internal/Version.java \ + src/main/java/org/testng/internal/Version.java iconv --from-code=ISO-8859-2 --to-code=UTF-8 ANNOUNCEMENT.txt > ANNOUNCEMENT.txt.utf8 mv -f ANNOUNCEMENT.txt.utf8 ANNOUNCEMENT.txt -iconv --from-code=ISO-8859-2 --to-code=UTF-8 CHANGES.txt > CHANGES.txt.utf8 -mv -f CHANGES.txt.utf8 CHANGES.txt %build mvn-rpmbuild -Dmaven.local.debug=true -Dgpg.skip=true install javadoc:aggregate @@ -93,7 +77,7 @@ install -p -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}. # pom install -d -m 755 %{buildroot}%{_mavenpomdir} install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap +%add_maven_depmap JPP-%{name}.pom %{name}.jar # javadoc install -d -m 755 %{buildroot}%{_javadocdir}/%{name} @@ -107,9 +91,12 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %files javadoc %doc LICENSE.txt -%doc %{_javadocdir}/%{name} +%{_javadocdir}/%{name} %changelog +* Sun Feb 10 2013 Mat Booth - 6.8-1 +- Update to latest upstream release, rhbz #888233 + * Wed Feb 06 2013 Java SIG - 6.0.1-6 - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires with maven-local From edffce352bd2b92748fb628463a7513794f04802 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 May 2013 15:10:57 +0200 Subject: [PATCH 011/109] Update to upstream version 6.8.5 --- .gitignore | 1 + sources | 2 +- testng.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 19f7017..392580f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ testng-5.11.zip /testng-6.0.1.tar.xz /testng-6.8.tar.gz +/testng-6.8.5.tar.gz diff --git a/sources b/sources index fb1a809..156f4ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7a61453eed2218d4f905fe8c7d4f9501 testng-6.8.tar.gz +7e50234099fd37c4f2ea7893e1496f5e testng-6.8.5.tar.gz diff --git a/testng.spec b/testng.spec index 260c16a..a0b2897 100644 --- a/testng.spec +++ b/testng.spec @@ -2,7 +2,7 @@ %global group_id org.testng Name: testng -Version: 6.8 +Version: 6.8.5 Release: 1%{?dist} Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL @@ -94,6 +94,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* Tue May 14 2013 Mikolaj Izdebski - 6.8.5-1 +- Update to upstream version 6.8.5 + * Sun Feb 10 2013 Mat Booth - 6.8-1 - Update to latest upstream release, rhbz #888233 From 3816cedd427e7156be6368aff258b393dfa62beb Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 22:45:11 -0500 Subject: [PATCH 012/109] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- testng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testng.spec b/testng.spec index a0b2897..e7e4274 100644 --- a/testng.spec +++ b/testng.spec @@ -3,7 +3,7 @@ Name: testng Version: 6.8.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL License: ASL 2.0 and CPL @@ -94,6 +94,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 6.8.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue May 14 2013 Mikolaj Izdebski - 6.8.5-1 - Update to upstream version 6.8.5 From 2f0452e5983aec38dc7101521e320693dd2e520a Mon Sep 17 00:00:00 2001 From: gil Date: Sun, 4 Aug 2013 11:33:03 +0200 Subject: [PATCH 013/109] Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild, switch to XMvn --- testng.spec | 53 +++++++++++++++++++++-------------------------------- 1 file changed, 21 insertions(+), 32 deletions(-) diff --git a/testng.spec b/testng.spec index e7e4274..ce56d70 100644 --- a/testng.spec +++ b/testng.spec @@ -7,24 +7,24 @@ Release: 2%{?dist} Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL License: ASL 2.0 and CPL -Group: Development/Libraries URL: http://testng.org/ Source0: https://github.com/cbeust/testng/archive/%{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: java-devel -BuildRequires: jpackage-utils -BuildRequires: maven-local -BuildRequires: beust-jcommander >= 1.27 -BuildRequires: snakeyaml -BuildRequires: google-guice -Requires: java -Requires: jpackage-utils -Requires: beust-jcommander >= 1.27 -Requires: snakeyaml -Requires: google-guice +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) +BuildRequires: mvn(org.yaml:snakeyaml) + +BuildRequires: maven-local +BuildRequires: maven-plugin-bundle %description TestNG is a testing framework inspired from JUnit and NUnit but introducing @@ -34,8 +34,6 @@ functional, end-to-end, integration, etc. %package javadoc Summary: API documentation for %{name} -Group: Documentation -Requires: jpackage-utils %description javadoc This package contains the API documentation for %{name}. @@ -44,6 +42,7 @@ This package contains the API documentation for %{name}. %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 \ @@ -52,6 +51,9 @@ sed -i "s|com.google.inject.internal|com.google.common.collect|" \ src/test/java/test/mustache/MustacheTest.java \ src/test/java/test/thread/B.java +%pom_remove_plugin :maven-gpg-plugin +%pom_remove_plugin :maven-source-plugin + # remove bundled stuff rm -rf spring rm -rf 3rdparty @@ -67,31 +69,18 @@ iconv --from-code=ISO-8859-2 --to-code=UTF-8 ANNOUNCEMENT.txt > ANNOUNCEMENT.txt mv -f ANNOUNCEMENT.txt.utf8 ANNOUNCEMENT.txt %build -mvn-rpmbuild -Dmaven.local.debug=true -Dgpg.skip=true install javadoc:aggregate + +%mvn_file : %{name} +%mvn_build -- -Dmaven.local.debug=true %install -# jars -install -d -m 755 %{buildroot}%{_javadir} -install -p -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +%mvn_install -# pom -install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap JPP-%{name}.pom %{name}.jar - -# javadoc -install -d -m 755 %{buildroot}%{_javadocdir}/%{name} -cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} - -%files +%files -f .mfiles %doc LICENSE.txt ANNOUNCEMENT.txt CHANGES.txt README -%{_javadir}/%{name}.jar -%{_mavenpomdir}/JPP-%{name}.pom -%{_mavendepmapfragdir}/%{name} -%files javadoc +%files javadoc -f .mfiles-javadoc %doc LICENSE.txt -%{_javadocdir}/%{name} %changelog * Sun Aug 04 2013 Fedora Release Engineering - 6.8.5-2 From e6afc4349d0de5c95e3dfee0492dd6a9be4846bb Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Thu, 12 Sep 2013 16:43:44 +0200 Subject: [PATCH 014/109] Update to upstream version 6.8.7 - Provide additional jdk15 classifier --- .gitignore | 1 + sources | 2 +- testng.spec | 14 ++++++++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 392580f..9701caa 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ testng-5.11.zip /testng-6.0.1.tar.xz /testng-6.8.tar.gz /testng-6.8.5.tar.gz +/testng-6.8.7.tar.gz diff --git a/sources b/sources index 156f4ae..d92e836 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7e50234099fd37c4f2ea7893e1496f5e testng-6.8.5.tar.gz +b97889b8714eec487d466c179322395d testng-6.8.7.tar.gz diff --git a/testng.spec b/testng.spec index ce56d70..03549ef 100644 --- a/testng.spec +++ b/testng.spec @@ -2,8 +2,8 @@ %global group_id org.testng Name: testng -Version: 6.8.5 -Release: 2%{?dist} +Version: 6.8.7 +Release: 1%{?dist} Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL License: ASL 2.0 and CPL @@ -68,9 +68,11 @@ native2ascii -encoding UTF-8 src/main/java/org/testng/internal/Version.java \ iconv --from-code=ISO-8859-2 --to-code=UTF-8 ANNOUNCEMENT.txt > ANNOUNCEMENT.txt.utf8 mv -f ANNOUNCEMENT.txt.utf8 ANNOUNCEMENT.txt -%build - %mvn_file : %{name} +# jdk15 classifier is used by some other packages +%mvn_alias : :::jdk15: + +%build %mvn_build -- -Dmaven.local.debug=true %install @@ -83,6 +85,10 @@ mv -f ANNOUNCEMENT.txt.utf8 ANNOUNCEMENT.txt %doc LICENSE.txt %changelog +* Thu Sep 12 2013 Stanislav Ochotnicky - 6.8.7-1 +- Update to upstream version 6.8.7 +- Provide additional jdk15 classifier + * Sun Aug 04 2013 Fedora Release Engineering - 6.8.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From a999d4fb2e36d3447ce13ae44e819b6c01f4a199 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Feb 2014 13:56:15 +0100 Subject: [PATCH 015/109] Update to upstream version 6.8.8 --- .gitignore | 1 + sources | 2 +- testng.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9701caa..08da13f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ testng-5.11.zip /testng-6.8.tar.gz /testng-6.8.5.tar.gz /testng-6.8.7.tar.gz +/testng-6.8.8.tar.gz diff --git a/sources b/sources index d92e836..86af4ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b97889b8714eec487d466c179322395d testng-6.8.7.tar.gz +9c153cf95752a8d3fa3b02fd686ea1dd testng-6.8.8.tar.gz diff --git a/testng.spec b/testng.spec index 03549ef..9c55550 100644 --- a/testng.spec +++ b/testng.spec @@ -2,7 +2,7 @@ %global group_id org.testng Name: testng -Version: 6.8.7 +Version: 6.8.8 Release: 1%{?dist} Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL @@ -85,6 +85,9 @@ mv -f ANNOUNCEMENT.txt.utf8 ANNOUNCEMENT.txt %doc LICENSE.txt %changelog +* Wed Feb 26 2014 Mikolaj Izdebski - 6.8.8-1 +- Update to upstream version 6.8.8 + * Thu Sep 12 2013 Stanislav Ochotnicky - 6.8.7-1 - Update to upstream version 6.8.7 - Provide additional jdk15 classifier From d00483a7578cb6d634d23c01fee4e91494ebd843 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 03:23:34 -0500 Subject: [PATCH 016/109] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- testng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testng.spec b/testng.spec index 9c55550..fa75b1b 100644 --- a/testng.spec +++ b/testng.spec @@ -3,7 +3,7 @@ Name: testng Version: 6.8.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL License: ASL 2.0 and CPL @@ -85,6 +85,9 @@ mv -f ANNOUNCEMENT.txt.utf8 ANNOUNCEMENT.txt %doc LICENSE.txt %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 6.8.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed Feb 26 2014 Mikolaj Izdebski - 6.8.8-1 - Update to upstream version 6.8.8 From b82a4af215cceb277f25e6afc6faa874dfc0ad1b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 4 Aug 2014 07:09:41 +0200 Subject: [PATCH 017/109] Fix build-requires on sonatype-oss-parent --- testng.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/testng.spec b/testng.spec index fa75b1b..0c7ecdd 100644 --- a/testng.spec +++ b/testng.spec @@ -3,7 +3,7 @@ Name: testng Version: 6.8.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL License: ASL 2.0 and CPL @@ -20,7 +20,7 @@ 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) +BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) BuildRequires: mvn(org.yaml:snakeyaml) BuildRequires: maven-local @@ -85,6 +85,9 @@ mv -f ANNOUNCEMENT.txt.utf8 ANNOUNCEMENT.txt %doc LICENSE.txt %changelog +* Mon Aug 4 2014 Mikolaj Izdebski - 6.8.8-3 +- Fix build-requires on sonatype-oss-parent + * Sun Jun 08 2014 Fedora Release Engineering - 6.8.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 24012d38c4e3c91fe05a5ec51bbefb8f524e54f4 Mon Sep 17 00:00:00 2001 From: gil Date: Wed, 14 Jan 2015 11:48:56 +0100 Subject: [PATCH 018/109] Update to 6.8.14 --- .gitignore | 1 + sources | 2 +- testng.spec | 9 +++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 08da13f..b32b60b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ testng-5.11.zip /testng-6.8.5.tar.gz /testng-6.8.7.tar.gz /testng-6.8.8.tar.gz +/testng-6.8.14.tar.gz diff --git a/sources b/sources index 86af4ef..a514c4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9c153cf95752a8d3fa3b02fd686ea1dd testng-6.8.8.tar.gz +b13448cc680cdab14cb95f77f9dfe1ec testng-6.8.14.tar.gz diff --git a/testng.spec b/testng.spec index 0c7ecdd..4645211 100644 --- a/testng.spec +++ b/testng.spec @@ -2,8 +2,8 @@ %global group_id org.testng Name: testng -Version: 6.8.8 -Release: 3%{?dist} +Version: 6.8.14 +Release: 1%{?dist} Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL License: ASL 2.0 and CPL @@ -12,8 +12,6 @@ Source0: https://github.com/cbeust/testng/archive/%{name}-%{version}.ta BuildArch: noarch -BuildRequires: java-devel - BuildRequires: mvn(com.beust:jcommander) >= 1.27 BuildRequires: mvn(com.google.guava:guava) BuildRequires: mvn(com.google.inject:guice) @@ -85,6 +83,9 @@ mv -f ANNOUNCEMENT.txt.utf8 ANNOUNCEMENT.txt %doc LICENSE.txt %changelog +* Wed Jan 14 2015 gil cattaneo 6.8.14-1 +- Update to 6.8.14 + * Mon Aug 4 2014 Mikolaj Izdebski - 6.8.8-3 - Fix build-requires on sonatype-oss-parent From b00f0491881d38891b024cb9e242b8e24384e92e Mon Sep 17 00:00:00 2001 From: gil Date: Tue, 20 Jan 2015 07:49:26 +0100 Subject: [PATCH 019/109] Update to 6.8.17 --- .gitignore | 1 + sources | 2 +- testng.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b32b60b..d895298 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ testng-5.11.zip /testng-6.8.7.tar.gz /testng-6.8.8.tar.gz /testng-6.8.14.tar.gz +/testng-6.8.17.tar.gz diff --git a/sources b/sources index a514c4e..e8e5da3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b13448cc680cdab14cb95f77f9dfe1ec testng-6.8.14.tar.gz +8a6487c0c6ee066578ca2a4fa4a9837b testng-6.8.17.tar.gz diff --git a/testng.spec b/testng.spec index 4645211..f53112d 100644 --- a/testng.spec +++ b/testng.spec @@ -2,7 +2,7 @@ %global group_id org.testng Name: testng -Version: 6.8.14 +Version: 6.8.17 Release: 1%{?dist} Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL @@ -83,6 +83,9 @@ mv -f ANNOUNCEMENT.txt.utf8 ANNOUNCEMENT.txt %doc LICENSE.txt %changelog +* Tue Jan 20 2015 gil cattaneo 6.8.17-1 +- Update to 6.8.17 + * Wed Jan 14 2015 gil cattaneo 6.8.14-1 - Update to 6.8.14 From 7e935e410f6dc149e25536e5dfd5614db85195af Mon Sep 17 00:00:00 2001 From: gil Date: Wed, 4 Feb 2015 22:28:59 +0100 Subject: [PATCH 020/109] Update to 6.8.21 --- .gitignore | 1 + sources | 2 +- testng.spec | 11 ++++++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d895298..f46d75b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ testng-5.11.zip /testng-6.8.8.tar.gz /testng-6.8.14.tar.gz /testng-6.8.17.tar.gz +/testng-6.8.21.tar.gz diff --git a/sources b/sources index e8e5da3..62d7cca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a6487c0c6ee066578ca2a4fa4a9837b testng-6.8.17.tar.gz +6d2331958850922796329a9d9e141e02 testng-6.8.21.tar.gz diff --git a/testng.spec b/testng.spec index f53112d..c6034cb 100644 --- a/testng.spec +++ b/testng.spec @@ -2,7 +2,7 @@ %global group_id org.testng Name: testng -Version: 6.8.17 +Version: 6.8.21 Release: 1%{?dist} Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL @@ -77,12 +77,17 @@ mv -f ANNOUNCEMENT.txt.utf8 ANNOUNCEMENT.txt %mvn_install %files -f .mfiles -%doc LICENSE.txt ANNOUNCEMENT.txt CHANGES.txt README +%doc ANNOUNCEMENT.txt CHANGES.txt README +%license LICENSE.txt %files javadoc -f .mfiles-javadoc -%doc LICENSE.txt +%license LICENSE.txt %changelog +* Tue Jan 20 2015 gil cattaneo 6.8.21-1 +- Update to 6.8.21 +- introduce license macro + * Tue Jan 20 2015 gil cattaneo 6.8.17-1 - Update to 6.8.17 From 09aace1f8fbfff4c9e06b3916ffdf01ded89c520 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 02:45:18 +0000 Subject: [PATCH 021/109] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- testng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testng.spec b/testng.spec index c6034cb..8eae07e 100644 --- a/testng.spec +++ b/testng.spec @@ -3,7 +3,7 @@ Name: testng Version: 6.8.21 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL License: ASL 2.0 and CPL @@ -84,6 +84,9 @@ mv -f ANNOUNCEMENT.txt.utf8 ANNOUNCEMENT.txt %license LICENSE.txt %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 6.8.21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Tue Jan 20 2015 gil cattaneo 6.8.21-1 - Update to 6.8.21 - introduce license macro From 93bf19d0718add75334ae01289c5c1c69b4dd5f8 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 7 Sep 2015 12:33:53 +0100 Subject: [PATCH 022/109] Update to 6.9.5 --- .gitignore | 2 +- sources | 2 +- testng.spec | 67 ++++++++++++++++++++++++----------------------------- 3 files changed, 32 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index f46d75b..1b57129 100644 --- a/.gitignore +++ b/.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 diff --git a/sources b/sources index 62d7cca..73a3afd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6d2331958850922796329a9d9e141e02 testng-6.8.21.tar.gz +acfcadb5d16c5d7a317d1af0890ab1b4 testng-6.9.5.tar.gz diff --git a/testng.spec b/testng.spec index 8eae07e..a2d19af 100644 --- a/testng.spec +++ b/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 - 6.9.5-1 +- Update to 6.9.5 + * Fri Jun 19 2015 Fedora Release Engineering - 6.8.21-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 07eedebb764f0830a4adc9984113aa755403932a Mon Sep 17 00:00:00 2001 From: gil Date: Tue, 13 Oct 2015 02:55:29 +0200 Subject: [PATCH 023/109] Update to 6.9.8 --- .gitignore | 1 + sources | 2 +- testng.spec | 22 +++++++++++++--------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 1b57129..66d9b05 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /testng-6.8.17.tar.gz /testng-6.8.21.tar.gz /testng-6.9.5.tar.gz +/6.9.8.tar.gz diff --git a/sources b/sources index 73a3afd..984c12c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -acfcadb5d16c5d7a317d1af0890ab1b4 testng-6.9.5.tar.gz +aa62b50454e578657bc0eede8afeb20a 6.9.8.tar.gz diff --git a/testng.spec b/testng.spec index a2d19af..e2e110d 100644 --- a/testng.spec +++ b/testng.spec @@ -1,16 +1,16 @@ %global group_id org.testng -Name: testng -Version: 6.9.5 -Release: 1%{?dist} -Summary: Java-based testing framework +Name: testng +Version: 6.9.8 +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/testng-%{version}.tar.gz +License: ASL 2.0 and CPL +URL: http://testng.org/ +Source0: https://github.com/cbeust/testng/archive/%{version}.tar.gz -BuildArch: noarch +BuildArch: noarch BuildRequires: maven-local BuildRequires: mvn(com.beust:jcommander) @@ -18,6 +18,7 @@ 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.assertj:assertj-core) BuildRequires: mvn(org.beanshell:bsh) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) @@ -30,7 +31,7 @@ distributed test running. It is designed to cover unit tests as well as functional, end-to-end, integration, etc. %package javadoc -Summary: API documentation for %{name} +Summary: API documentation for %{name} %description javadoc This package contains the API documentation for %{name}. @@ -74,6 +75,9 @@ mv ./src/main/resources/org/testng/internal/VersionTemplateJava ./src/main/resou %license LICENSE.txt %changelog +* Tue Oct 13 2015 gil cattaneo 6.9.8-1 +- Update to 6.9.8 + * Mon Sep 07 2015 Mat Booth - 6.9.5-1 - Update to 6.9.5 From 50618bce9802a80dbbf643da4e6dfd5a51eba1c9 Mon Sep 17 00:00:00 2001 From: gil Date: Tue, 13 Oct 2015 03:04:06 +0200 Subject: [PATCH 024/109] enable test suite --- testng.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testng.spec b/testng.spec index e2e110d..b47bb3f 100644 --- a/testng.spec +++ b/testng.spec @@ -37,7 +37,7 @@ Summary: API documentation for %{name} This package contains the API documentation for %{name}. %prep -%setup -q -n %{name}-%{name}-%{version} +%setup -q -n %{name}-%{version} # remove any bundled libs find -name *.jar -delete @@ -49,7 +49,7 @@ find -name *.class -delete %pom_remove_plugin :maven-javadoc-plugin # test deps not in Fedora -%pom_remove_dep org.assertj:assertj-core +#%% pom_remove_dep org.assertj:assertj-core # plugins not in Fedora %pom_remove_plugin com.coderplus.maven.plugins:copy-rename-maven-plugin @@ -61,8 +61,8 @@ mv ./src/main/resources/org/testng/internal/VersionTemplateJava ./src/main/resou %mvn_alias : :::jdk15: %build -# TODO build tests when assetj-core becomes available -%mvn_build -f -- -Dmaven.local.debug=true +# TODO build tests when assetj-core becomes available -f +%mvn_build -- -Dmaven.local.debug=true %install %mvn_install From 2c82f601b5f655b15bb15dd55ba8f265d7621c94 Mon Sep 17 00:00:00 2001 From: gil Date: Tue, 27 Oct 2015 08:00:39 +0100 Subject: [PATCH 025/109] update to 6.9.9 --- .gitignore | 1 + sources | 2 +- testng.spec | 12 +++++++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 66d9b05..a5e1ce1 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /testng-6.8.21.tar.gz /testng-6.9.5.tar.gz /6.9.8.tar.gz +/6.9.9.tar.gz diff --git a/sources b/sources index 984c12c..6792bf9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aa62b50454e578657bc0eede8afeb20a 6.9.8.tar.gz +57df5e7f3bd5606f2520c691cbd7fef3 6.9.9.tar.gz diff --git a/testng.spec b/testng.spec index b47bb3f..1d68f15 100644 --- a/testng.spec +++ b/testng.spec @@ -2,7 +2,7 @@ %global group_id org.testng Name: testng -Version: 6.9.8 +Version: 6.9.9 Release: 1%{?dist} Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL @@ -48,20 +48,19 @@ find -name *.class -delete %pom_remove_plugin :maven-source-plugin %pom_remove_plugin :maven-javadoc-plugin -# test deps not in Fedora -#%% pom_remove_dep org.assertj:assertj-core - # 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 +cp -p ./src/main/java/*.dtd.html ./src/main/resources/. + %mvn_file : %{name} # jdk15 classifier is used by some other packages %mvn_alias : :::jdk15: %build -# TODO build tests when assetj-core becomes available -f + %mvn_build -- -Dmaven.local.debug=true %install @@ -75,6 +74,9 @@ mv ./src/main/resources/org/testng/internal/VersionTemplateJava ./src/main/resou %license LICENSE.txt %changelog +* Tue Oct 27 2015 gil cattaneo 6.9.9-1 +- Update to 6.9.9 + * Tue Oct 13 2015 gil cattaneo 6.9.8-1 - Update to 6.9.8 From e0085f7dfa152ced8e47f69f370127ce184c3394 Mon Sep 17 00:00:00 2001 From: gil Date: Fri, 8 Jan 2016 15:48:59 +0100 Subject: [PATCH 026/109] Update to 6.9.10 --- .gitignore | 1 + sources | 2 +- testng.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a5e1ce1..0d717c0 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /testng-6.9.5.tar.gz /6.9.8.tar.gz /6.9.9.tar.gz +/6.9.10.tar.gz diff --git a/sources b/sources index 6792bf9..f968771 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -57df5e7f3bd5606f2520c691cbd7fef3 6.9.9.tar.gz +170a556ea372caf535a56366c4b1c595 6.9.10.tar.gz diff --git a/testng.spec b/testng.spec index 1d68f15..d4fca8e 100644 --- a/testng.spec +++ b/testng.spec @@ -2,7 +2,7 @@ %global group_id org.testng Name: testng -Version: 6.9.9 +Version: 6.9.10 Release: 1%{?dist} Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL @@ -39,8 +39,8 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{name}-%{version} -# remove any bundled libs -find -name *.jar -delete +# remove any bundled libs, but not test resources +find ! -path "*/test/*" -name *.jar -print -delete find -name *.class -delete # these are unnecessary @@ -55,6 +55,7 @@ mv ./src/main/resources/org/testng/internal/VersionTemplateJava ./src/main/resou cp -p ./src/main/java/*.dtd.html ./src/main/resources/. + %mvn_file : %{name} # jdk15 classifier is used by some other packages %mvn_alias : :::jdk15: @@ -74,6 +75,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %license LICENSE.txt %changelog +* Fri Jan 08 2016 gil cattaneo 6.9.10-1 +- Update to 6.9.10 + * Tue Oct 27 2015 gil cattaneo 6.9.9-1 - Update to 6.9.9 From 35ca6cdab6c3b158bed4afd5b6f0cf243ac58fbe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 01:29:06 +0000 Subject: [PATCH 027/109] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- testng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testng.spec b/testng.spec index d4fca8e..68d35e5 100644 --- a/testng.spec +++ b/testng.spec @@ -3,7 +3,7 @@ Name: testng Version: 6.9.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL License: ASL 2.0 and CPL @@ -75,6 +75,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %license LICENSE.txt %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 6.9.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jan 08 2016 gil cattaneo 6.9.10-1 - Update to 6.9.10 From 07151c9e89ab6ffcf1d204c4b8e3f88e766655f5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 20 Apr 2016 10:07:38 +0200 Subject: [PATCH 028/109] Update to upstream version 6.9.11 --- .gitignore | 1 + sources | 2 +- testng.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0d717c0..838c80e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /6.9.8.tar.gz /6.9.9.tar.gz /6.9.10.tar.gz +/6.9.11.tar.gz diff --git a/sources b/sources index f968771..db4f285 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -170a556ea372caf535a56366c4b1c595 6.9.10.tar.gz +2364b55f3cd4973604355c65c72165ee 6.9.11.tar.gz diff --git a/testng.spec b/testng.spec index 68d35e5..7db72d5 100644 --- a/testng.spec +++ b/testng.spec @@ -2,8 +2,8 @@ %global group_id org.testng Name: testng -Version: 6.9.10 -Release: 2%{?dist} +Version: 6.9.11 +Release: 1%{?dist} Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL License: ASL 2.0 and CPL @@ -75,6 +75,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %license LICENSE.txt %changelog +* Wed Apr 20 2016 Mikolaj Izdebski - 6.9.11-1 +- Update to upstream version 6.9.11 + * Fri Feb 05 2016 Fedora Release Engineering - 6.9.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From a9f892bd1b3b5f0aeb07372ced242f8ed40814b5 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 2 Nov 2016 11:45:46 +0000 Subject: [PATCH 029/109] Update to upstream version 6.9.12 - Avoid 'SNAPSHOT' in pom version to fix tests in testng-remote package --- .gitignore | 4 ++++ sources | 2 +- testng.spec | 22 +++++++++++++++++----- 3 files changed, 22 insertions(+), 6 deletions(-) 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 From 95bdc138073dc33eda956a40c7b079c7bf55812a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 1 Feb 2017 18:59:28 +0100 Subject: [PATCH 030/109] Introduce build-conditional to allow building without groovy --- testng.spec | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/testng.spec b/testng.spec index d97b03e..f418e79 100644 --- a/testng.spec +++ b/testng.spec @@ -1,6 +1,8 @@ +%bcond_without groovy + Name: testng Version: 6.9.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL License: ASL 2.0 and CPL @@ -15,14 +17,16 @@ 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.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) +%if %{with groovy} +BuildRequires: mvn(org.assertj:assertj-core) +BuildRequires: mvn(org.codehaus.gmavenplus:gmavenplus-plugin) +BuildRequires: mvn(org.codehaus.groovy:groovy-all) +BuildRequires: mvn(org.spockframework:spock-core) +%endif %description TestNG is a testing framework inspired from JUnit and NUnit but introducing @@ -49,10 +53,12 @@ find -name *.class -delete %pom_remove_plugin :maven-javadoc-plugin # missing test deps +%if %{with groovy} %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" +%endif # avoid SNAPSHOT in version number sed -i -e '//s/-SNAPSHOT//' pom.xml @@ -70,7 +76,11 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %mvn_alias : :::jdk15: %build +%if %{with groovy} %mvn_build -- -Dmaven.local.debug=true +%else +%mvn_build -f -- -Dmaven.local.debug=true +%endif %install %mvn_install @@ -83,6 +93,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %license LICENSE.txt %changelog +* Wed Feb 1 2017 Mikolaj Izdebski - 6.9.12-2 +- Introduce build-conditional to allow building without groovy + * 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 From 5e7e764257eeaced38fdb25edec5e7a037da5319 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 15:48:03 +0000 Subject: [PATCH 031/109] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- testng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testng.spec b/testng.spec index f418e79..6feb235 100644 --- a/testng.spec +++ b/testng.spec @@ -2,7 +2,7 @@ Name: testng Version: 6.9.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL License: ASL 2.0 and CPL @@ -93,6 +93,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %license LICENSE.txt %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 6.9.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 1 2017 Mikolaj Izdebski - 6.9.12-2 - Introduce build-conditional to allow building without groovy From 1bc5a1eb30d6f640e32f757e6e5d09bb399f9608 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 17 Feb 2017 14:38:09 +0000 Subject: [PATCH 032/109] License correction --- testng.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testng.spec b/testng.spec index 6feb235..1b99ec7 100644 --- a/testng.spec +++ b/testng.spec @@ -2,10 +2,9 @@ Name: testng Version: 6.9.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java-based testing framework -# org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL -License: ASL 2.0 and CPL +License: ASL 2.0 URL: http://testng.org/ Source0: https://github.com/cbeust/testng/archive/%{version}.tar.gz @@ -93,6 +92,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %license LICENSE.txt %changelog +* Fri Feb 17 2017 Mat Booth - 6.9.12-4 +- License correction + * Sat Feb 11 2017 Fedora Release Engineering - 6.9.12-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 2f8a7def0a7b836b8aea3ee5c6ecacf1ec3cf608 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Wed, 31 May 2017 13:46:43 +0200 Subject: [PATCH 033/109] Avoid accidental javascript in comment --- ...oid-accidental-javascript-in-javadoc.patch | 25 +++++++++++++++++++ testng.spec | 8 +++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0001-Avoid-accidental-javascript-in-javadoc.patch diff --git a/0001-Avoid-accidental-javascript-in-javadoc.patch b/0001-Avoid-accidental-javascript-in-javadoc.patch new file mode 100644 index 0000000..8016b86 --- /dev/null +++ b/0001-Avoid-accidental-javascript-in-javadoc.patch @@ -0,0 +1,25 @@ +From 214bd64764a48c5c3ad68829e0e35377f45ce221 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Wed, 31 May 2017 13:44:36 +0200 +Subject: [PATCH] Avoid accidental javascript in javadoc + +--- + src/main/java/org/testng/xml/TestNGContentHandler.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/main/java/org/testng/xml/TestNGContentHandler.java b/src/main/java/org/testng/xml/TestNGContentHandler.java +index e36c413..da9a069 100755 +--- a/src/main/java/org/testng/xml/TestNGContentHandler.java ++++ b/src/main/java/org/testng/xml/TestNGContentHandler.java +@@ -240,7 +240,7 @@ public class TestNGContentHandler extends DefaultHandler { + } + + /** +- * Parse ++ + + + -+ +- ++ + -+ +- ++ -+ +- ++