java-sig-commits March 2011

java-sig-commits@lists.fedoraproject.org

7 participants
89 discussions

[apache-commons-math] Update to 2.2
by Mohamed ElMorabity 10 Mar '11

10 Mar '11

commit efafd5518625b8c979458f76009620696d439838 Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org> Date: Thu Mar 10 15:52:34 2011 +0100 Update to 2.2 .gitignore | 1 + ...he-commons-math-2.2-remove_clirr_from_pom.patch | 19 ++++++++++--------- apache-commons-math.spec | 13 ++++++++----- sources | 2 +- 4 files changed, 20 insertions(+), 15 deletions(-) --- diff --git a/.gitignore b/.gitignore index 68e9658..f8e7695 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ commons-math-2.0-src.tar.gz /commons-math-2.1-src.tar.gz +/commons-math-2.2-src.tar.gz diff --git a/commons-math-remove-clirr-from-pom.patch b/apache-commons-math-2.2-remove_clirr_from_pom.patch similarity index 63% rename from commons-math-remove-clirr-from-pom.patch rename to apache-commons-math-2.2-remove_clirr_from_pom.patch index adf545a..357a5a0 100644 --- a/commons-math-remove-clirr-from-pom.patch +++ b/apache-commons-math-2.2-remove_clirr_from_pom.patch @@ -1,13 +1,14 @@ ---- pom.xml 2010-10-22 03:37:42.930470377 +0200 -+++ pom.xml 2010-10-22 03:38:07.199469768 +0200 -@@ -269,17 +269,6 @@ +diff -up commons-math-2.2-src/pom.xml.orig commons-math-2.2-src/pom.xml +--- commons-math-2.2-src/pom.xml.orig 2011-02-26 19:14:36.000000000 +0100 ++++ commons-math-2.2-src/pom.xml 2011-03-10 15:05:36.988244002 +0100 +@@ -280,17 +280,6 @@ </descriptors> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>clirr-maven-plugin</artifactId> -- <version>2.2.2</version> +- <version>2.3</version> - <executions> - <execution> - <goals> @@ -16,18 +17,18 @@ - </executions> - </plugin> </plugins> - </build> - <reporting> -@@ -324,14 +313,6 @@ + <resources> + <resource> +@@ -350,14 +339,6 @@ <headerFile>${basedir}/license-header.txt</headerFile> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>clirr-maven-plugin</artifactId> -- <version>2.2.2</version> +- <version>2.2.3</version> - <configuration> -- <minSeverity>info</minSeverity> +- <minSeverity>${minSeverity}</minSeverity> - </configuration> - </plugin> </plugins> diff --git a/apache-commons-math.spec b/apache-commons-math.spec index c242f7e..d152f3a 100644 --- a/apache-commons-math.spec +++ b/apache-commons-math.spec @@ -2,15 +2,15 @@ %global short_name commons-%{base_name} Name: apache-%{short_name} -Version: 2.1 -Release: 4%{?dist} +Version: 2.2 +Release: 1%{?dist} Summary: Java library of lightweight mathematics and statistics components Group: Development/Libraries License: ASL 1.1 and ASL 2.0 and BSD URL: http://commons.apache.org/%{base_name}/ Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{vers… -Patch0: %{short_name}-remove-clirr-from-pom.patch +Patch0: %{name}-2.2-remove_clirr_from_pom.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: java-devel >= 1:1.6.0 @@ -26,7 +26,7 @@ BuildRequires: maven-jar-plugin BuildRequires: maven-javadoc-plugin BuildRequires: maven-plugin-bundle BuildRequires: maven-resources-plugin -#Should be replaced by maven-surefire-plugin after f15 branch +# Should be replaced by maven-surefire-plugin after f15 branch BuildRequires: maven-surefire-maven-plugin BuildRequires: maven-surefire-provider-junit4 Requires: java >= 1:1.6.0 @@ -52,7 +52,7 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{short_name}-%{version}-src -%patch0 -p0 +%patch0 -p1 -b .remove_clirr_from_pom %build @@ -113,6 +113,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %changelog +* Thu Mar 10 2011 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 2.2-1 +- Update to 2.2 + * Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index d5004c5..610c9ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5e7f431d77e87888c79f74b0d5a603f0 commons-math-2.1-src.tar.gz +6261d7991154c992477b32b8f3bea18b commons-math-2.2-src.tar.gz

1 0

File commons-math-2.2-src.tar.gz uploaded to lookaside cache by melmorabity
by Mohamed ElMorabity 10 Mar '11

10 Mar '11

A file has been added to the lookaside cache for apache-commons-math: 6261d7991154c992477b32b8f3bea18b commons-math-2.2-src.tar.gz

1 0

[maven-enforcer/f15/master] Update to latest upstream (1.0)
by Stanislav Ochotnicky 10 Mar '11

10 Mar '11

Summary of changes: 89d75dc... Update to latest upstream (1.0) (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[maven-enforcer] Update to latest upstream (1.0)
by Stanislav Ochotnicky 10 Mar '11

10 Mar '11

commit 89d75dc68626c68d7953debb120e3fed5916a01f Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Thu Mar 10 09:26:35 2011 +0100 Update to latest upstream (1.0) .gitignore | 1 + maven-enforcer.spec | 38 +++++++++++++++++++------------------- sources | 2 +- 3 files changed, 21 insertions(+), 20 deletions(-) --- diff --git a/.gitignore b/.gitignore index 1e95165..097e0c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ enforcer-1.0-beta-2.tar.xz +/enforcer-1.0.tar.xz diff --git a/maven-enforcer.spec b/maven-enforcer.spec index cd808db..fc11002 100644 --- a/maven-enforcer.spec +++ b/maven-enforcer.spec @@ -1,16 +1,15 @@ -%global project_version 1.0-beta-2 Name: maven-enforcer Version: 1.0 -Release: 0.3.b2%{?dist} +Release: 1%{?dist} Summary: Maven Enforcer Group: Development/Libraries License: ASL 2.0 URL: http://maven.apache.org/enforcer -#svn export http://svn.apache.org/repos/asf/maven/enforcer/tags/enforcer-1.0-beta-2 enforcer-1.0-beta-2 -#tar caf enforcer-1.0-beta-2.tar.xz enforcer-1.0-beta-2 -Source0: enforcer-%{project_version}.tar.xz +#svn export http://svn.apache.org/repos/asf/maven/enforcer/tags/enforcer-1.0 enforcer-1.0 +#tar caf enforcer-1.0.tar.xz enforcer-1.0 +Source0: enforcer-%{version}.tar.xz Source1: %{name}-depmap.xml Patch0: fix-site.patch @@ -18,7 +17,7 @@ BuildArch: noarch BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: maven2 +BuildRequires: maven BuildRequires: maven-plugin-plugin BuildRequires: maven-assembly-plugin BuildRequires: maven-compiler-plugin @@ -38,7 +37,7 @@ BuildRequires: maven-surefire-provider-junit BuildRequires: tomcat6 BuildRequires: plexus-maven-plugin BuildRequires: plexus-containers-component-javadoc -Requires: maven2 +Requires: maven Requires: jpackage-utils Requires: java Requires(post): jpackage-utils @@ -86,29 +85,27 @@ This component contains the standard Enforcer Rules. %prep -%setup -q -n enforcer-%{project_version} +%setup -q -n enforcer-%{version} %patch0 # fix old dep on javadoc taglet sed -i 's:<artifactId>plexus-javadoc</artifactId>:<artifactId>plexus-component-javadoc</artifactId>:' pom.xml %build -export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository -mvn-jpp \ +mvn-rpmbuild \ -e \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - -Dmaven2.jpp.depmap.file=%{SOURCE1} \ + -Dmaven.local.depmap.file=%{SOURCE1} \ -Dmaven.test.failure.ignore=true \ install javadoc:aggregate %install # jars install -d -m 0755 %{buildroot}%{_javadir}/%{name} -install -m 644 enforcer-api/target/enforcer-api-%{project_version}.jar \ +install -m 644 enforcer-api/target/enforcer-api-%{version}.jar \ %{buildroot}%{_javadir}/%{name}/enforcer-api.jar -install -m 644 enforcer-rules/target/enforcer-rules-%{project_version}.jar \ +install -m 644 enforcer-rules/target/enforcer-rules-%{version}.jar \ %{buildroot}%{_javadir}/%{name}/enforcer-rules.jar -install -m 644 maven-enforcer-plugin/target/maven-enforcer-plugin-%{project_version}.jar \ +install -m 644 maven-enforcer-plugin/target/maven-enforcer-plugin-%{version}.jar \ %{buildroot}%{_javadir}/%{name}/plugin.jar # poms @@ -116,19 +113,19 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} install -pm 644 pom.xml \ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom -%add_to_maven_depmap org.apache.maven.enforcer enforcer %{project_version} JPP %{name} +%add_to_maven_depmap org.apache.maven.enforcer enforcer %{version} JPP %{name} install -pm 644 enforcer-api/pom.xml \ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-enforcer-api.pom -%add_to_maven_depmap org.apache.maven.enforcer enforcer-api %{project_version} JPP/%{name} enforcer-api +%add_to_maven_depmap org.apache.maven.enforcer enforcer-api %{version} JPP/%{name} enforcer-api install -pm 644 enforcer-rules/pom.xml \ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-enforcer-rules.pom -%add_to_maven_depmap org.apache.maven.enforcer enforcer-rules %{project_version} JPP/%{name} enforcer-rules +%add_to_maven_depmap org.apache.maven.enforcer enforcer-rules %{version} JPP/%{name} enforcer-rules install -pm 644 maven-enforcer-plugin/pom.xml \ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-plugin.pom -%add_to_maven_depmap org.apache.maven.plugins maven-enforcer-plugin %{project_version} JPP/%{name} plugin +%add_to_maven_depmap org.apache.maven.plugins maven-enforcer-plugin %{version} JPP/%{name} plugin # javadoc install -d -m 755 %{buildroot}%{_javadocdir}/%{name} @@ -170,6 +167,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %{_javadir}/%{name}/plugin* %changelog +* Thu Mar 10 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.0-1 +- Update to latest upstream (1.0) + * Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0-0.3.b2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index fe9f035..993749f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5b0330f91f21a9c4feb351389f2c88a0 enforcer-1.0-beta-2.tar.xz +f6a23483fbfdc517f8ebb7dedbfa76a0 enforcer-1.0.tar.xz

1 0

File enforcer-1.0.tar.xz uploaded to lookaside cache by sochotni
by Stanislav Ochotnicky 10 Mar '11

10 Mar '11

A file has been added to the lookaside cache for maven-enforcer: f6a23483fbfdc517f8ebb7dedbfa76a0 enforcer-1.0.tar.xz

1 0

[ant] Fix xalan-j2 subpackage path.
by Alexander Kurtakov 10 Mar '11

10 Mar '11

commit fd234081fd4db0f26aef950fb3be008d501cfc3c Author: Alexander Kurtakov <akurtako(a)redhat.com> Date: Thu Mar 10 09:43:09 2011 +0200 Fix xalan-j2 subpackage path. ant.spec | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) --- diff --git a/ant.spec b/ant.spec index 949cc9d..f8ad41d 100644 --- a/ant.spec +++ b/ant.spec @@ -50,7 +50,7 @@ Name: ant Version: 1.8.2 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 0 Summary: Build tool for java Summary(it): Tool per la compilazione di programmi java @@ -325,6 +325,7 @@ Group: Development/Tools Requires: %{name} = %{epoch}:%{version}-%{release} Requires: regexp BuildRequires: regexp +Requires: xalan-j2 Provides: ant-apache-xalan2 = %{epoch}:%{version}-%{release} %description apache-xalan2 @@ -587,7 +588,7 @@ echo "bcel ant/ant-apache-bcel" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache echo "log4j ant/ant-apache-log4j" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-log4j echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-oro echo "regexp ant/ant-apache-regexp" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-regexp -echo "xalan-j2 ant/ant-apache-xalan2" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-xalan2 +echo "xalan-j2 xalan-j2-serializer ant/ant-apache-xalan2" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-xalan2 echo "javamail jaf ant/ant-javamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/javamail echo "jdepend ant/ant-jdepend" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jdepend echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch @@ -807,6 +808,9 @@ rm -rf $RPM_BUILD_ROOT # ----------------------------------------------------------------------------- %changelog +* Thu Mar 10 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.8.2-5 +- Fix xalan-j2 subpackage path. + * Tue Feb 22 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.8.2-4 - Change oro to jakarta-oro in BR/R

1 0

[apache-commons-exec] fix maven fragment
by Tom Callaway 07 Mar '11

07 Mar '11

commit e231409bff2bcb82318d9245d60e91bef6a7464b Author: Tom "spot" Callaway <tcallawa(a)redhat.com> Date: Mon Mar 7 14:53:41 2011 -0500 fix maven fragment apache-commons-exec.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index af8a386..0e4f0a2 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java library to reliably execute external processes from within the JVM Group: Development/Libraries @@ -75,7 +75,7 @@ cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_datadir}/maven2/poms cp -p pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom -%add_to_maven_depmap org.apache.maven %{name} %{version} JPP %{name} +%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name} %clean @@ -104,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 07 2011 Tom Callaway <spot(a)fedoraproject.org> - 1.1-3 +- fix maven fragment + * Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

1 0

[apache-commons-exec/f15/master] fix maven fragment
by Tom Callaway 07 Mar '11

07 Mar '11

commit cfb9453a11a50f8ac33457c7206fa9fb69c347c7 Author: Tom "spot" Callaway <tcallawa(a)redhat.com> Date: Mon Mar 7 14:52:25 2011 -0500 fix maven fragment apache-commons-exec.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec index af8a386..0e4f0a2 100644 --- a/apache-commons-exec.spec +++ b/apache-commons-exec.spec @@ -3,7 +3,7 @@ Name: apache-commons-exec Version: 1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java library to reliably execute external processes from within the JVM Group: Development/Libraries @@ -75,7 +75,7 @@ cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_datadir}/maven2/poms cp -p pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom -%add_to_maven_depmap org.apache.maven %{name} %{version} JPP %{name} +%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name} %clean @@ -104,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 07 2011 Tom Callaway <spot(a)fedoraproject.org> - 1.1-3 +- fix maven fragment + * Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

1 0

[maven-surefire/f15/master] Update to latest version (2.7.2)
by Stanislav Ochotnicky 07 Mar '11

07 Mar '11

Summary of changes: 61183d2... Update to latest version (2.7.2) (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[maven-surefire] Update to latest version (2.7.2)
by Stanislav Ochotnicky 07 Mar '11

07 Mar '11

commit 61183d21f821e80ecc6fe714aee1c7894dec5450 Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Mon Mar 7 15:25:55 2011 +0100 Update to latest version (2.7.2) - Add common-junit* jars to distribution - Versionless jars & javadocs - Use maven 3 to build .gitignore | 1 + 0001-Remove-mockito-dependency.patch | 36 +++++----- 0002-Fix-failsafe-plugin-dependency-version.patch | 22 +++++- 0003-Remove-htmlunit-dependency.patch | 29 ++++++++ maven-surefire.spec | 75 +++++++++++++------- sources | 2 +- 6 files changed, 116 insertions(+), 49 deletions(-) --- diff --git a/.gitignore b/.gitignore index 9bd27c6..1e6808c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ maven-surefire-booter-1.5.3.tar.gz maven-surefire-2.3-src.tar.gz /maven-surefire-2.6-src.tar.xz surefire-2.7.1-source-release.zip +/surefire-2.7.2-source-release.zip diff --git a/0001-Remove-mockito-dependency.patch b/0001-Remove-mockito-dependency.patch index d7b38d8..5055a92 100644 --- a/0001-Remove-mockito-dependency.patch +++ b/0001-Remove-mockito-dependency.patch @@ -1,29 +1,29 @@ -From 52e835422220d9d4d626cfdbbc7a9f629c51a5ff Mon Sep 17 00:00:00 2001 +From d8dae0655ef37ca2217250af2c62639092e4e652 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky <sochotnicky(a)redhat.com> -Date: Tue, 24 Aug 2010 13:21:20 +0200 -Subject: [PATCH 1/2] Remove mockito dependency +Date: Mon, 7 Mar 2011 11:16:28 +0100 +Subject: [PATCH 1/3] Remove mockito dependency --- surefire-providers/surefire-junit47/pom.xml | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/surefire-providers/surefire-junit47/pom.xml b/surefire-providers/surefire-junit47/pom.xml -index 29dd961..2f18172 100644 +index 1565bb2..3885ff8 100644 --- a/surefire-providers/surefire-junit47/pom.xml +++ b/surefire-providers/surefire-junit47/pom.xml -@@ -42,12 +42,6 @@ - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - </dependency> -- <dependency> -- <groupId>org.mockito</groupId> -- <artifactId>mockito-all</artifactId> -- <version>1.7</version> -- <scope>test</scope> -- </dependency> - </dependencies> - - <build> +@@ -43,12 +43,6 @@ + <artifactId>plexus-utils</artifactId> + </dependency> + <dependency> +- <groupId>org.mockito</groupId> +- <artifactId>mockito-all</artifactId> +- <version>1.7</version> +- <scope>test</scope> +- </dependency> +- <dependency> + <groupId>org.apache.maven.surefire</groupId> + <artifactId>common-junit4</artifactId> + <version>${project.version}</version> -- -1.7.2.1 +1.7.4 diff --git a/0002-Fix-failsafe-plugin-dependency-version.patch b/0002-Fix-failsafe-plugin-dependency-version.patch index 0ee9248..ccc6fe1 100644 --- a/0002-Fix-failsafe-plugin-dependency-version.patch +++ b/0002-Fix-failsafe-plugin-dependency-version.patch @@ -1,11 +1,25 @@ ---- surefire-integration-tests/pom.xml.sav 2010-12-23 00:27:02.000000000 +0200 -+++ surefire-integration-tests/pom.xml 2010-12-29 23:41:18.701266133 +0200 -@@ -173,7 +173,7 @@ +From ee2bebae60e63d0fc5de7481aead6bfe6b16dd94 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky <sochotnicky(a)redhat.com> +Date: Mon, 7 Mar 2011 11:17:20 +0100 +Subject: [PATCH 2/3] Fix failsafe-plugin dependency version + +--- + surefire-integration-tests/pom.xml | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/surefire-integration-tests/pom.xml b/surefire-integration-tests/pom.xml +index 38da051..5bc709f 100644 +--- a/surefire-integration-tests/pom.xml ++++ b/surefire-integration-tests/pom.xml +@@ -176,7 +176,7 @@ </plugin> <plugin> <artifactId>maven-failsafe-plugin</artifactId> -- <version>2.7</version> +- <version>2.7.1</version> + <version>${project.version}</version> <configuration>   +-- +1.7.4 + diff --git a/0003-Remove-htmlunit-dependency.patch b/0003-Remove-htmlunit-dependency.patch new file mode 100644 index 0000000..32bb3ae --- /dev/null +++ b/0003-Remove-htmlunit-dependency.patch @@ -0,0 +1,29 @@ +From 7f208bb9e3fe1e81c59e17ef08b14abe56ebd351 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky <sochotnicky(a)redhat.com> +Date: Mon, 7 Mar 2011 11:24:48 +0100 +Subject: [PATCH 3/3] Remove htmlunit dependency + +--- + surefire-integration-tests/pom.xml | 6 ------ + 1 files changed, 0 insertions(+), 6 deletions(-) + +diff --git a/surefire-integration-tests/pom.xml b/surefire-integration-tests/pom.xml +index 5bc709f..91cbdf2 100644 +--- a/surefire-integration-tests/pom.xml ++++ b/surefire-integration-tests/pom.xml +@@ -90,12 +90,6 @@ + <artifactId>plexus-utils</artifactId> + <scope>test</scope> + </dependency> +- <dependency> +- <groupId>net.sourceforge.htmlunit</groupId> +- <artifactId>htmlunit</artifactId> +- <version>2.8</version> +- <scope>test</scope> +- </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> +-- +1.7.4 + diff --git a/maven-surefire.spec b/maven-surefire.spec index b9714cb..3624559 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -1,6 +1,6 @@ Name: maven-surefire -Version: 2.7.1 -Release: 3%{?dist} +Version: 2.7.2 +Release: 1%{?dist} Epoch: 0 Summary: Test framework project License: ASL 2.0 @@ -16,6 +16,9 @@ Patch1: 0001-Remove-mockito-dependency.patch # use current version of maven-failsafe-plugin present in maven-surefire Patch2: 0002-Fix-failsafe-plugin-dependency-version.patch +# remove test dep on htmlunit +Patch3: 0003-Remove-htmlunit-dependency.patch + BuildArch: noarch BuildRequires: ant BuildRequires: ant-nodeps @@ -26,7 +29,7 @@ BuildRequires: plexus-utils BuildRequires: junit4 BuildRequires: testng -BuildRequires: maven2 +BuildRequires: maven BuildRequires: maven-compiler-plugin BuildRequires: maven-help-plugin BuildRequires: maven-install-plugin @@ -148,20 +151,17 @@ Javadoc for %{name}. %setup -q -n surefire-%{version} %patch1 -p1 -b .sav -%patch2 -b .sav +%patch2 -p1 -b .sav +%patch3 -p1 -b .sav %build -export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository -mkdir -p $MAVEN_REPO_LOCAL # tests turned off because they need jmock -mvn-jpp -e \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - -Dmaven2.jpp.depmap.file=%{SOURCE1} \ +mvn-rpmbuild -e \ + -Dmaven.local.depmap.file=%{SOURCE1} \ -Dmaven.test.skip=true \ install javadoc:aggregate %install -rm -rf $RPM_BUILD_ROOT # jars install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/maven-surefire install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} @@ -187,15 +187,24 @@ install -pm 644 surefire-booter/target/surefire-booter-*.jar $RPM_BUILD_ROOT%{_j %add_to_maven_depmap org.apache.maven.surefire surefire-booter %{version} JPP/maven-surefire booter install -pm 644 surefire-booter/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-booter.pom -install -pm 644 surefire-providers/surefire-junit/target/surefire-junit3-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/junit.jar +install -pm 644 surefire-providers/common-junit3/target/common-junit3-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/common-junit.jar +%add_to_maven_depmap org.apache.maven.surefire common-junit3 %{version} JPP/maven-surefire common-junit +install -pm 644 surefire-providers/common-junit3/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-common-junit.pom + +install -pm 644 surefire-providers/surefire-junit3/target/original-surefire-junit3-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/junit.jar %add_to_maven_depmap org.apache.maven.surefire surefire-junit3 %{version} JPP/maven-surefire junit -install -pm 644 surefire-providers/surefire-junit/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-junit.pom +%add_to_maven_depmap org.apache.maven.surefire surefire-junit %{version} JPP/maven-surefire junit +install -pm 644 surefire-providers/surefire-junit3/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-junit.pom + +install -pm 644 surefire-providers/common-junit4/target/common-junit4-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/common-junit4.jar +%add_to_maven_depmap org.apache.maven.surefire common-junit4 %{version} JPP/maven-surefire common-junit4 +install -pm 644 surefire-providers/common-junit4/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-common-junit4.pom -install -pm 644 surefire-providers/surefire-junit4/target/surefire-junit4-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/junit4.jar +install -pm 644 surefire-providers/surefire-junit4/target/original-surefire-junit4-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/junit4.jar %add_to_maven_depmap org.apache.maven.surefire surefire-junit4 %{version} JPP/maven-surefire junit4 install -pm 644 surefire-providers/surefire-junit4/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-junit4.pom -install -pm 644 surefire-providers/surefire-junit47/target/surefire-junit47-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/junit47.jar +install -pm 644 surefire-providers/surefire-junit47/target/original-surefire-junit47-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/junit47.jar %add_to_maven_depmap org.apache.maven.surefire surefire-junit47 %{version} JPP/maven-surefire junit47 install -pm 644 surefire-providers/surefire-junit47/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-junit47.pom @@ -214,9 +223,8 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-main.p %add_to_maven_depmap org.apache.maven.surefire surefire %{version} JPP/maven-surefire main # javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -sf %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} +install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} # Create compatibility links ln -s %{_javadir}/maven-surefire/api.jar \ @@ -229,6 +237,12 @@ ln -s %{_javadir}/maven-surefire/maven-plugin.jar \ ln -s %{_javadir}/maven-surefire/report-maven-plugin.jar \ $RPM_BUILD_ROOT%{_datadir}/maven2/plugins/surefire-report-plugin.jar +%pre javadoc +# workaround for rpm bug, can be removed in F-18 +[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \ +rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : + + %post %update_maven_depmap @@ -238,46 +252,55 @@ ln -s %{_javadir}/maven-surefire/report-maven-plugin.jar \ %files %defattr(-,root,root,-) %dir %{_javadir}/maven-surefire -%{_javadir}/maven-surefire/api* -%{_javadir}/maven-surefire/booter* +%{_javadir}/maven-surefire/api.jar +%{_javadir}/maven-surefire/booter.jar %{_javadir}/maven-surefire/surefire.jar -%{_javadir}/maven-surefire/common* +%{_javadir}/maven-surefire/common.jar %{_mavenpomdir}/* %{_mavendepmapfragdir}/* %files plugin %defattr(-,root,root,-) -%{_javadir}/maven-surefire/maven-plugin* +%{_javadir}/maven-surefire/maven-plugin.jar %dir %{_datadir}/maven2/plugins %{_datadir}/maven2/plugins/surefire-plugin.jar %files report-plugin %defattr(-,root,root,-) -%{_javadir}/maven-surefire/report-maven-plugin* +%{_javadir}/maven-surefire/report-maven-plugin.jar %dir %{_datadir}/maven2/plugins %{_datadir}/maven2/plugins/surefire-report-plugin.jar %files provider-junit %defattr(-,root,root,-) -%{_javadir}/maven-surefire/junit[^4]* +%{_javadir}/maven-surefire/junit.jar +%{_javadir}/maven-surefire/common-junit.jar %files provider-junit4 %defattr(-,root,root,-) -%{_javadir}/maven-surefire/junit4* +%{_javadir}/maven-surefire/junit4.jar +%{_javadir}/maven-surefire/junit47.jar +%{_javadir}/maven-surefire/common-junit4.jar %files provider-testng %defattr(-,root,root,-) -%{_javadir}/maven-surefire/testng* +%{_javadir}/maven-surefire/testng.jar %files -n maven-failsafe-plugin %defattr(-,root,root,-) -%{_javadir}/maven-failsafe-plugin*jar +%{_javadir}/maven-failsafe-plugin.jar %files javadoc %defattr(-,root,root,-) %doc %{_javadocdir}/* %changelog +* Mon Mar 7 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.7.2-1 +- Update to latest version (2.7.2) +- Add common-junit* jars to distribution +- Versionless javadocs +- Use maven 3 to build + * Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:2.7.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 57cb67b..3c112a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3c21b19c8aaf0f1666a45246b352cd6e surefire-2.7.1-source-release.zip +ebf5879e9a7faf1c53d64bb70c8657b6 surefire-2.7.2-source-release.zip

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

java-sig-commits March 2011