diff --git a/java-testng-5.9-build_xml-notest.patch b/java-testng-5.9-build_xml-notest.patch deleted file mode 100644 index 62cb54f..0000000 --- a/java-testng-5.9-build_xml-notest.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- testng-5.9/build.xml 2008-06-16 08:03:22.000000000 +0200 -+++ testng-5.9/build.xml-gil 2009-06-27 15:34:58.000000000 +0200 -@@ -76,7 +76,7 @@ - - - -+ depends="prepare,validate,copy-resources,build,dist-jar" /> - - diff --git a/java-testng.spec b/java-testng.spec index f5e225b..0875d11 100644 --- a/java-testng.spec +++ b/java-testng.spec @@ -1,183 +1,57 @@ Name: java-testng -Version: 5.9 -Release: 5mamba +Version: 7.4.0 +Release: 1mamba Summary: A testing framework inspired from JUnit and NUnit Group: Development/Tools Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: http://testng.org/doc/documentation-main.html -# http://testng.googlecode.com/svn/tags/5.10/ -Source0: http://testng.org/testng-%{version}.zip -Source1: http://testng.googlecode.com/svn/tags/%{version}/pom.xml -# svn export http://testng.googlecode.com/svn/trunk/test-14/ -# svn export http://testng.googlecode.com/svn/trunk/maven/ maven -# tar czf testng-5.9-maven-plugin-src-svn.tar.gz maven -Source2: testng-%{version}-maven-plugin-src-svn.tar.gz -Patch: java-testng-5.9-build_xml-notest.patch -# svn export http://testng.googlecode.com/svn/trunk/test/ -License: Apache Software License Version 2.0 +URL: https://testng.org/doc/ +Source: https://github.com/cbeust/testng.git/%{version}/testng-%{version}.tar.bz2 +License: Apache License 2.0 Group: Documentation -BuildRequires: apache-ant -BuildRequires: apache-ant-junit -BuildRequires: jakarta-commons-logging -%if "%{stage1}" != "1" -BuildRequires: jakarta-commons-jelly-tags-jsl -BuildRequires: jakarta-commons-jelly-tags-xml -%endif -BuildRequires: java-backport-util-concurrent -BuildRequires: java-DTDDoc -BuildRequires: java-bsh2 -BuildRequires: java-junit3 -BuildRequires: java-qdox16 -#BuildRequires: spring-framework >= 2.0.2 todo -BuildRequires: jpackage-utils -BuildRequires: xalan-j2 -Requires: java-backport-util-concurrent -Requires: java-bsh2 -Requires: java-qdox16 -BuildRoot: %{_tmppath}/%{name}-%{version}-root +## AUTOBUILDREQ-BEGIN +## AUTOBUILDREQ-END +BuildRequires: gradle +BuildRequires: javapackages +BuildRequires: java-environment %description TestNG is a testing framework inspired from JUnit and NUnit but introducing some new functionalities that make it more powerful and easier to use. -%package javadoc -Group: Documentation -Summary: Javadoc for %{name} - -%description javadoc -TestNG is a testing framework inspired from JUnit and NUnit but introducing some new functionalities that make it more powerful and easier to use. - -This package contains javadoc for %{name}. - -%package manual -Group: Documentation -Summary: Documents for %{name} - -%description manual -TestNG is a testing framework inspired from JUnit and NUnit but introducing some new functionalities that make it more powerful and easier to use. - -This package contains documents for %{name}. - -%package -n testng-maven-plugin -Group: Development/Libraries/Java -Summary: TestNG Maven Plugin -%if "%{stage1}" != "1" -Requires: apache-maven2 -Requires: jakarta-commons-jelly-tags-jsl -Requires: jakarta-commons-jelly-tags-xml -%endif -Requires: %{name} - -%description -n testng-maven-plugin -TestNG is a testing framework inspired from JUnit and NUnit but introducing some new functionalities that make it more powerful and easier to use. - -This package contains TestNG Maven Plugin. - %prep -%setup -q -n testng-%{version} -a 2 -%patch -p1 - -for f in $(find . -name "*.jar"); do - mv $f $f.no -done - -pushd 3rdparty - ln -sf $(build-classpath backport-util-concurrent) backport-util-concurrent-2.2.jar - ln -sf $(build-classpath bsh2/bsh) bsh-2.0b4.jar - ln -sf $(build-classpath qdox16) qdox-1.6.1.jar - ln -sf $(build-classpath junit-3.8.2) junit.jar -popd - -# ln -sf $(build-classpath commons-logging) spring/3rdparty/commons-logging-1.0.4.jar -# mv ./spring/3rdparty/spring-mock.jar ./spring/3rdparty/spring-mock.jar.no 2.0.2 -# mv ./spring/3rdparty/spring.jar ./spring/3rdparty/spring.jar.no 2.0.2 -# mv ./spring/3rdparty/commons-logging-1.0.4.jar ./spring/3rdparty/commons-logging-1.0.4.jar.no +%setup -q -n testng-%{version} %build -export JAVA_HOME=%{_jvmdir}/jdk -export CLASSPATH=$(build-classpath junit-3.8.2 qdox16 xalan-j2-serializer \ - DTDDoc bsh2/bsh backport-util-concurrent ant/ant-junit) -ant dev - -%if "%{stage1}" != "1" -export CLASSPATH=$CLASSPATH:$(build-classpath commons-jelly-tags-xml commons-jelly-tags-jsl):testng-%{version}-jdk15.jar:testng-%{version}-jdk14.jar -%endif -ant -Dtestng-maven.version=2.2.0 maven-plugin - -export CLASSPATH=$CLASSPATH:testng-%{version}-jdk15.jar:testng-%{version}-jdk14.jar -ant javadocs +gradle --daemon clean build -x test %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -mkdir -p %{buildroot}%{_javadir} -mkdir -p %{buildroot}%{_datadir}/maven2/poms -mkdir -p %{buildroot}%{_datadir}/maven2/plugins - -install -pm 644 testng-%{version}-jdk14.jar %{buildroot}%{_javadir}/testng-jdk14-%{version}.jar -%add_to_maven_depmap org.testng testng-jdk14 %{version} JPP testng-jdk14 -install -pm 644 testng-%{version}-jdk15.jar %{buildroot}%{_javadir}/testng-jdk15-%{version}.jar -%add_to_maven_depmap org.testng testng-jdk15 %{version} JPP testng-jdk15 -%add_to_maven_depmap org.testng testng %{version} JPP testng-jdk15 - +install -D -m644 \ + build/libs/testng-%{version}.jar \ + %{buildroot}%{_javadir}/testng/testng-%{version}.jar + ( - cd %{buildroot}%{_javadir} + cd %{buildroot}%{_javadir}/testng for jar in *-%{version}*.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"` done ) -install -pm 644 maven-testng-plugin-2.2.0.jar \ - %{buildroot}%{_javadir}/testng-maven-plugin-2.2.0.jar -install -pm 644 maven/project.xml \ - %{buildroot}%{_datadir}/maven2/poms/JPP-testng-maven-plugin.pom -%add_to_maven_depmap org.testng maven-testng-plugin 1.2 JPP testng-maven-plugin - -( - cd %{buildroot}%{_javadir} - for jar in *-2.2.0*; do - ln -sf ${jar} `echo $jar| sed "s|-2.2.0||g"` - done -) - -install -pm 644 %{S:1} \ - %{buildroot}%{_datadir}/maven2/poms/JPP-testng.pom - -mkdir -p %{buildroot}%{_javadocdir}/testng-%{version} -cp -pr javadocs/* %{buildroot}%{_javadocdir}/testng-%{version} -ln -s testng-%{version} %{buildroot}%{_javadocdir}/testng - %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %files %defattr(-,root,root) -%{_javadir}/testng-jdk14-%{version}.jar -%{_javadir}/testng-jdk14.jar -%{_javadir}/testng-jdk15-%{version}.jar -%{_javadir}/testng-jdk15.jar -%{_datadir}/maven2/poms -%exclude %{_datadir}/maven2/poms/JPP-testng-maven-plugin.pom -%{_mavendepmapfragdir} -%doc README - -%files javadoc -%defattr(-,root,root) -%{_javadocdir}/testng-%{version} -%{_javadocdir}/testng - -%files manual -%defattr(-,root,root) -%doc doc *.txt - -%files -n testng-maven-plugin -%defattr(-,root,root) -%{_javadir}/testng-maven-plugin-2.2.0.jar -%{_javadir}/testng-maven-plugin.jar -%{_datadir}/maven2/poms/JPP-testng-maven-plugin.pom +%dir %{_javadir}/testng +%{_javadir}/testng/testng-%{version}.jar +%{_javadir}/testng/testng.jar %changelog +* Sun Jul 25 2021 Silvan Calarco 7.4.0-1mamba +- update to 7.4.0 + * Sun Aug 14 2011 Silvan Calarco 5.9-5mamba - testng-maven-plugin: require apache-maven2 insted of apache-maven to fix dependencies. Will test this better later diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 4e5a1dd..0000000 --- a/pom.xml +++ /dev/null @@ -1,320 +0,0 @@ - - - 4.0.0 - org.testng - testng - TestNG - 5.6 - TestNG is a unit testing framework. - http://testng.org - - - - Apache License, Version 2.0 - http://apache.org/licenses/LICENSE-2.0 - - - - - scm:svn:a${scm.url} - http://testng.googlecode.com/svn/trunk - - - - - - - - - jdk14 - - 1.4 - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - src/jdk14 - - - - - - add-source - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.4 - - - - org.apache.maven.plugins - maven-jar-plugin - - - - jdk14 - - - jar - - - - - - org.codehaus.mojo - dependency-maven-plugin - - - - backport-util-concurrent - backport-util-concurrent - 2.2 - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - process-sources - - - - - - - run - - - - - - - - - jdk15 - - !1.4 - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - jdk15 - - - jar - - - - - - org.apache.maven.plugins - maven-install-plugin - 2.2 - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.codehaus.mojo - build-helper-maven-plugin - - - src/jdk15 - - - - - - add-source - - - - - - - - - default-tools.jar - - - java.vendor - Sun Microsystems Inc. - - - - - com.sun - tools - 1.4.2 - system - true - ${java.home}/../lib/tools.jar - - - - - - - - ant - ant - 1.6.5 - true - - - junit - junit - 3.8.1 - - - qdox - qdox - 1.6.1 - provided - - - org.beanshell - bsh - 2.0b4 - provided - - - - - src/main - - - src/main - - **/*.dtd - - - - - - - org.codehaus.mojo - dependency-maven-plugin - - ${project.build.outputDirectory} - - - qdox - qdox - 1.6.1 - - - org.beanshell - bsh - 2.0b4 - - - - - - - unpack - - - - - - org.apache.maven.plugins - maven-clean-plugin - 2.2 - - - org.apache.maven.plugins - maven-jar-plugin - - - true - true - - org.testng.TestNG - - - - - - org.apache.maven.plugins - maven-source-plugin - - - - jar - - - - - - - - - - - snapshots - scp://beaver.codehaus.org/home/projects/maven/repository-staging/snapshots/maven2 - - - -