Attachment 665434 Details for Bug 888233 – Update to 6.7

[patch] Update to 6.7

0001-Update-to-6.7.patch (text/plain), 3.82 KB, created by gil cattaneo on 2012-12-18 10:55:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-12-18 10:55:57 UTC

Size: 3.82 KB

patch

obsolete

>From 09f02c5f177f47da3adfa4d334f73e439a8d9e11 Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Tue, 18 Dec 2012 11:54:17 +0100
>Subject: [PATCH] Update to 6.7
>
>---
> testng.spec | 47 +++++++++++++++++++++++++++++++++++------------
> 1 file changed, 35 insertions(+), 12 deletions(-)
>
>diff --git a/testng.spec b/testng.spec
>index 4ec9a20..7e366db 100644
>--- a/testng.spec
>+++ b/testng.spec
>@@ -2,30 +2,30 @@
> %global group_id  org.testng
> 
> Name:             testng
>-Version:          6.0.1
>-Release:          5%{?dist}
>+Version:          6.7
>+Release:          1%{?dist}
> Summary:          Java-based testing framework
> # .../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
>+# (cd testng && git archive --prefix="testng-6.7/" --format=tar testng-6.7 | xz > ../testng-6.7.tar.xz)
> Source0:          %{name}-%{version}.tar.xz
> 
>-Patch0:           %{name}-test-fails-workaround.patch
>-
> BuildArch:        noarch
> 
> BuildRequires:    java-devel
> BuildRequires:    jpackage-utils
> BuildRequires:    maven
>+BuildRequires:    maven-surefire-provider-testng
> BuildRequires:    beust-jcommander
> BuildRequires:    snakeyaml
>+BuildRequires:    guava
> 
> Requires:         beust-jcommander
> Requires:         snakeyaml
>+Requires:         guava
> Requires:         java
> Requires:         jpackage-utils
> 
>@@ -46,7 +46,19 @@ This package contains the API documentation for %{name}.
> %prep
> %setup -q
> 
>-%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
>+
>+%pom_add_dep com.google.guava:guava
>+%pom_add_dep com.google.guava:guava pom-test.xml
>+
>+%pom_add_dep net.sf.cglib:cglib:any:test pom-test.xml
> 
> # remove bundled stuff
> rm -rf spring
>@@ -58,10 +70,6 @@ rm -rf sandbox
> rm -rf examples
> rm -f *.jar
> 
>-
>-# fix the ant group_id ... ant -> org.apache.ant
>-sed -i 's/<groupId>ant/<groupId>org.apache.ant/g' pom.xml
>-
> # replace CR+LF with LF
> sed -i 's/\r//g' README
> 
>@@ -82,6 +90,9 @@ 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
> 
>+native2ascii -encoding UTF8 src/main/java/org/testng/internal/Version.java \
>+  src/main/java/org/testng/internal/Version.java
>+
> %build
> mvn-rpmbuild -Dmaven.local.debug=true -Dgpg.skip=true install javadoc:aggregate
> 
>@@ -99,8 +110,17 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
> install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
> cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
> 
>+%check
>+# this test fails
>+rm -r src/test/java/test/junit4/JUnit4Sample2.java
>+mvn-rpmbuild \
>+  -Dmaven.local.debug=true \
>+  -Dgpg.skip=true \
>+  -Dtest.resources.dir=$PWD/src/test/resources \
>+  verify -f pom-test.xml
>+
> %files
>-%doc LICENSE.txt ANNOUNCEMENT.txt CHANGES.txt README
>+%doc LICENSE.txt ANNOUNCEMENT.txt CHANGES.txt NOTES README
> %{_javadir}/%{name}.jar
> %{_mavenpomdir}/JPP-%{name}.pom
> %{_mavendepmapfragdir}/%{name}
>@@ -110,6 +130,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
> %doc %{_javadocdir}/%{name}
> 
> %changelog
>+* Tue Dec 18 2012 gil cattaneo <puntogil@libero.it> - 6.7-1
>+- Update to 6.7
>+
> * Thu Nov 08 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 6.0.1-5
> - Part of testng is CPL, add it to license tag
> 
>-- 
>1.8.0.2
>

Actions: View | Diff

Attachments on bug 888233: 665434