[maven-surefire] Update to latest upstream version (2.8)
by Stanislav Ochotnicky
commit ccf593e8843f35102b2f88c9bd7c546e34498a35
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Mar 29 15:49:19 2011 +0200
Update to latest upstream version (2.8)
.gitignore | 1 +
0001-Remove-mockito-dependency.patch | 8 +++---
0002-Fix-failsafe-plugin-dependency-version.patch | 25 ------------------
0002-Remove-htmlunit-dependency.patch | 29 +++++++++++++++++++++
0003-Remove-htmlunit-dependency.patch | 29 ---------------------
maven-surefire.spec | 18 +++++++------
sources | 2 +-
7 files changed, 45 insertions(+), 67 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1e6808c..c0ab6b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ 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
+/surefire-2.8-source-release.zip
diff --git a/0001-Remove-mockito-dependency.patch b/0001-Remove-mockito-dependency.patch
index 5055a92..ee61db0 100644
--- a/0001-Remove-mockito-dependency.patch
+++ b/0001-Remove-mockito-dependency.patch
@@ -1,14 +1,14 @@
-From d8dae0655ef37ca2217250af2c62639092e4e652 Mon Sep 17 00:00:00 2001
+From e8c67feb59487de9665aea6f8d7bc2948f5f818a Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
-Date: Mon, 7 Mar 2011 11:16:28 +0100
-Subject: [PATCH 1/3] Remove mockito dependency
+Date: Tue, 29 Mar 2011 14:44:37 +0200
+Subject: [PATCH 1/2] 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 1565bb2..3885ff8 100644
+index 52545bc..54a242d 100644
--- a/surefire-providers/surefire-junit47/pom.xml
+++ b/surefire-providers/surefire-junit47/pom.xml
@@ -43,12 +43,6 @@
diff --git a/0002-Remove-htmlunit-dependency.patch b/0002-Remove-htmlunit-dependency.patch
new file mode 100644
index 0000000..c6d44b3
--- /dev/null
+++ b/0002-Remove-htmlunit-dependency.patch
@@ -0,0 +1,29 @@
+From 979b7e928ab6f0ce4210dafdafb19e5478ba501f Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Tue, 29 Mar 2011 14:32:13 +0200
+Subject: [PATCH 2/2] 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 24de080..8077f2b 100644
+--- a/surefire-integration-tests/pom.xml
++++ b/surefire-integration-tests/pom.xml
+@@ -91,12 +91,6 @@
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+- <groupId>net.sourceforge.htmlunit</groupId>
+- <artifactId>htmlunit</artifactId>
+- <version>2.8</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.0.1</version>
+--
+1.7.4
+
diff --git a/maven-surefire.spec b/maven-surefire.spec
index 3624559..9428d68 100644
--- a/maven-surefire.spec
+++ b/maven-surefire.spec
@@ -1,5 +1,5 @@
Name: maven-surefire
-Version: 2.7.2
+Version: 2.8
Release: 1%{?dist}
Epoch: 0
Summary: Test framework project
@@ -11,13 +11,10 @@ Source0: http://repo2.maven.org/maven2/org/apache/maven/surefire/surefire
Source1: %{name}-jpp-depmap.xml
# mockito is not available in Fedora yet
-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
+Patch0: 0001-Remove-mockito-dependency.patch
# remove test dep on htmlunit
-Patch3: 0003-Remove-htmlunit-dependency.patch
+Patch1: 0002-Remove-htmlunit-dependency.patch
BuildArch: noarch
BuildRequires: ant
@@ -150,9 +147,11 @@ Javadoc for %{name}.
%prep
%setup -q -n surefire-%{version}
+sed -i 's:<version>2.7.2</version>:<version>${project.version}</version>:' \
+ surefire-integration-tests/pom.xml
+
+%patch0 -p1 -b .sav
%patch1 -p1 -b .sav
-%patch2 -p1 -b .sav
-%patch3 -p1 -b .sav
%build
# tests turned off because they need jmock
@@ -295,6 +294,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%doc %{_javadocdir}/*
%changelog
+* Tue Mar 29 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.8-1
+- Update to latest upstream version (2.8)
+
* 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
diff --git a/sources b/sources
index 3c112a2..be62938 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ebf5879e9a7faf1c53d64bb70c8657b6 surefire-2.7.2-source-release.zip
+0a60ffd58153d2291b318ece3e3b6294 surefire-2.8-source-release.zip
13 years
[httpcomponents-client] New upstream bugfix version (4.1.1)
by Stanislav Ochotnicky
commit 9e9e64bfa4f13d0568cc3fad9068bb23e7c4fb69
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Mar 29 14:08:37 2011 +0200
New upstream bugfix version (4.1.1)
.gitignore | 1 +
0001-Cleanup-pom.patch | 231 ++++++++++++++++++++++++--------------------
httpcomponents-client.spec | 9 +-
sources | 2 +-
4 files changed, 135 insertions(+), 108 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 724c402..8f49a16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/httpcomponents-client-4.0.3-src.tar.gz
httpcomponents-client-4.1-src.tar.gz
+/httpcomponents-client-4.1.1-src.tar.gz
diff --git a/0001-Cleanup-pom.patch b/0001-Cleanup-pom.patch
index a3ba083..0577ad9 100644
--- a/0001-Cleanup-pom.patch
+++ b/0001-Cleanup-pom.patch
@@ -1,6 +1,124 @@
---- pom.xml.sav 2011-01-17 15:00:53.000000000 -0500
-+++ pom.xml 2011-03-10 09:45:01.330282001 -0500
-@@ -81,28 +81,11 @@
+From 1e435abf209089692a3ba2dca86be757e892c10b Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Tue, 29 Mar 2011 14:02:03 +0200
+Subject: [PATCH] Cleanup pom
+
+---
+ httpclient/pom.xml | 45 +++++++++++------------------
+ httpmime/pom.xml | 7 ++++-
+ pom.xml | 79 +--------------------------------------------------
+ 3 files changed, 25 insertions(+), 106 deletions(-)
+
+diff --git a/httpclient/pom.xml b/httpclient/pom.xml
+index 4ce1cab..e0ac937 100644
+--- a/httpclient/pom.xml
++++ b/httpclient/pom.xml
+@@ -38,7 +38,7 @@
+ HttpComponents Client (base module)
+ </description>
+ <url>http://hc.apache.org/httpcomponents-client</url>
+- <packaging>jar</packaging>
++ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+@@ -65,12 +65,6 @@
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+- <dependency>
+- <groupId>org.mockito</groupId>
+- <artifactId>mockito-core</artifactId>
+- <version>${mockito.version}</version>
+- <scope>test</scope>
+- </dependency>
+ </dependencies>
+
+ <properties>
+@@ -116,25 +110,18 @@
+ </execution>
+ </executions>
+ </plugin>
+- <plugin>
+- <groupId>com.atlassian.maven.plugins</groupId>
+- <artifactId>maven-clover2-plugin</artifactId>
++ <plugin>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>maven-bundle-plugin</artifactId>
++ <extensions>true</extensions>
+ <configuration>
+- <flushPolicy>threaded</flushPolicy>
+- <flushInterval>100</flushInterval>
+- <targetPercentage>50%</targetPercentage>
++ <instructions>
++ <Export-Package>*</Export-Package>
++ <Private-Package></Private-Package>
++ </instructions>
+ </configuration>
+- <executions>
+- <execution>
+- <id>site</id>
+- <phase>pre-site</phase>
+- <goals>
+- <goal>instrument</goal>
+- </goals>
+- </execution>
+- </executions>
+- </plugin>
+- </plugins>
++ </plugin>
++ </plugins>
+ </build>
+
+ <reporting>
+@@ -161,11 +148,13 @@
+ </plugin>
+
+ <plugin>
+- <groupId>com.atlassian.maven.plugins</groupId>
+- <artifactId>maven-clover2-plugin</artifactId>
+- <version>${clover.version}</version>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+- <jdk>1.5</jdk>
++ <instructions>
++ <Export-Package>*</Export-Package>
++ <Private-Package></Private-Package>
++ </instructions>
+ </configuration>
+ </plugin>
+
+diff --git a/httpmime/pom.xml b/httpmime/pom.xml
+index 8853cc2..6922f99 100644
+--- a/httpmime/pom.xml
++++ b/httpmime/pom.xml
+@@ -38,7 +38,7 @@
+ HttpComponents HttpClient - MIME coded entities
+ </description>
+ <url>http://hc.apache.org/httpcomponents-client</url>
+- <packaging>jar</packaging>
++ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+@@ -112,6 +112,11 @@
+ </execution>
+ </executions>
+ </plugin>
++ <plugin>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>maven-bundle-plugin</artifactId>
++ <extensions>true</extensions>
++ </plugin>
+ </plugins>
+ </build>
+
+diff --git a/pom.xml b/pom.xml
+index e3ba289..8ab6b70 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -82,28 +82,11 @@
<modules>
<module>httpclient</module>
<module>httpmime</module>
@@ -29,7 +147,7 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
-@@ -189,49 +172,6 @@
+@@ -190,49 +173,6 @@
</configuration>
</plugin>
<plugin>
@@ -79,7 +197,7 @@
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
-@@ -252,14 +192,7 @@
+@@ -253,14 +193,7 @@
</execution>
</executions>
</plugin>
@@ -95,7 +213,7 @@
</build>
<reporting>
-@@ -280,15 +213,7 @@
+@@ -281,15 +214,7 @@
</reportSets>
</plugin>
@@ -112,101 +230,6 @@
</reporting>
</project>
---- httpclient/pom.xml.sav 2011-01-17 15:00:53.000000000 -0500
-+++ httpclient/pom.xml 2011-03-10 09:50:50.829281988 -0500
-@@ -38,7 +38,7 @@
- HttpComponents Client (base module)
- </description>
- <url>http://hc.apache.org/httpcomponents-client</url>
-- <packaging>jar</packaging>
-+ <packaging>bundle</packaging>
-
- <dependencies>
- <dependency>
-@@ -71,12 +71,6 @@
- <version>${easymock.version}</version>
- <scope>test</scope>
- </dependency>
-- <dependency>
-- <groupId>org.easymock</groupId>
-- <artifactId>easymockclassextension</artifactId>
-- <version>${easymock.version}</version>
-- <scope>test</scope>
-- </dependency>
- </dependencies>
-
- <properties>
-@@ -122,25 +116,18 @@
- </execution>
- </executions>
- </plugin>
-- <plugin>
-- <groupId>com.atlassian.maven.plugins</groupId>
-- <artifactId>maven-clover2-plugin</artifactId>
-+ <plugin>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>maven-bundle-plugin</artifactId>
-+ <extensions>true</extensions>
- <configuration>
-- <flushPolicy>threaded</flushPolicy>
-- <flushInterval>100</flushInterval>
-- <targetPercentage>50%</targetPercentage>
-+ <instructions>
-+ <Export-Package>*</Export-Package>
-+ <Private-Package></Private-Package>
-+ </instructions>
- </configuration>
-- <executions>
-- <execution>
-- <id>site</id>
-- <phase>pre-site</phase>
-- <goals>
-- <goal>instrument</goal>
-- </goals>
-- </execution>
-- </executions>
-- </plugin>
-- </plugins>
-+ </plugin>
-+ </plugins>
- </build>
-
- <reporting>
-@@ -165,14 +151,6 @@
- </plugin>
-
- <plugin>
-- <groupId>com.atlassian.maven.plugins</groupId>
-- <artifactId>maven-clover2-plugin</artifactId>
-- <configuration>
-- <jdk>1.5</jdk>
-- </configuration>
-- </plugin>
--
-- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
-
---- httpmime/pom.xml.sav 2011-01-17 15:00:44.000000000 -0500
-+++ httpmime/pom.xml 2011-03-10 09:45:01.330282001 -0500
-@@ -38,7 +38,7 @@
- HttpComponents HttpClient - MIME coded entities
- </description>
- <url>http://hc.apache.org/httpcomponents-client</url>
-- <packaging>jar</packaging>
-+ <packaging>bundle</packaging>
-
- <dependencies>
- <dependency>
-@@ -112,6 +112,11 @@
- </execution>
- </executions>
- </plugin>
-+ <plugin>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>maven-bundle-plugin</artifactId>
-+ <extensions>true</extensions>
-+ </plugin>
- </plugins>
- </build>
-
+--
+1.7.4
+
diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec
index cc8553a..f203789 100644
--- a/httpcomponents-client.spec
+++ b/httpcomponents-client.spec
@@ -2,8 +2,8 @@
Name: httpcomponents-client
Summary: HTTP agent implementation based on httpcomponents HttpCore
-Version: 4.1
-Release: 6%{?dist}
+Version: 4.1.1
+Release: 1%{?dist}
Group: Development/Libraries
License: ASL 2.0
URL: http://hc.apache.org/
@@ -44,7 +44,7 @@ API docs for %{name}.
%prep
%setup -q
-%patch0 -b .sav
+%patch0 -p1 -b .sav
%build
mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
@@ -92,6 +92,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%changelog
+* Tue Mar 29 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 4.1.1-1
+- New upstream bugfix version (4.1.1)
+
* Tue Mar 15 2011 Severin Gehwolf <sgehwolf(a)redhat.com> 4.1-6
- Explicitly set PrivatePackage to the empty set, so as to
export all packages.
diff --git a/sources b/sources
index f275dc8..038cbec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1a50cf1c2eeac0ff29a3cd095ed19954 httpcomponents-client-4.1-src.tar.gz
+12be9646128db4a4383e47341cbeb7fd httpcomponents-client-4.1.1-src.tar.gz
13 years
[apache-james-project] New upstream version (1.6)
by Stanislav Ochotnicky
commit f32f0b27697ddc54e13f2b251d3170ace2014241
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Mar 28 16:31:20 2011 +0200
New upstream version (1.6)
.gitignore | 1 +
apache-james-project.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cabbf2a..bf0ac02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/james-parent-1.5-source-release.zip
+/james-parent-1.6-source-release.zip
diff --git a/apache-james-project.spec b/apache-james-project.spec
index f5470c8..f3a7456 100644
--- a/apache-james-project.spec
+++ b/apache-james-project.spec
@@ -2,7 +2,7 @@
%global short_name apache-james
Name: %{short_name}-project
-Version: 1.5
+Version: 1.6
Release: 1%{?dist}
Summary: Main project POM files and resources
License: ASL 2.0
@@ -76,6 +76,9 @@ install -pm 644 project/server/%{server_ver}/pom.xml %{buildroot}%{_mavenpomdir}
%changelog
+* Mon Mar 28 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.6-1
+- New upstream version
+
* Mon Feb 21 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.5-1
- Initial version of the package
diff --git a/sources b/sources
index a1ce201..d39edd8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e1a3cda8583bb0e5d7d3172568cb0a63 james-parent-1.5-source-release.zip
+3c088e1b2ee08f3e13595f5a1d77ef60 james-parent-1.6-source-release.zip
13 years
[maven-gpg-plugin] Update to new upstream release.
by Alexander Kurtakov
commit d5408bfdf47adebbcbea0e5d7c410113e2175a0a
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Mar 25 14:18:17 2011 +0200
Update to new upstream release.
Adapt to current guidelines.
.gitignore | 1 +
maven-gpg-plugin.spec | 40 ++++++++++++----------------------------
sources | 2 +-
3 files changed, 14 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 83839a6..92b3728 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-gpg-plugin-1.1.tar.xz
+maven-gpg-plugin-1.2-source-release.zip
diff --git a/maven-gpg-plugin.spec b/maven-gpg-plugin.spec
index a50039a..16f7c6a 100644
--- a/maven-gpg-plugin.spec
+++ b/maven-gpg-plugin.spec
@@ -1,22 +1,19 @@
Name: maven-gpg-plugin
-Version: 1.1
-Release: 3%{?dist}
+Version: 1.2
+Release: 1%{?dist}
Summary: Maven GPG Plugin
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-gpg-plugin/
-# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-gpg-plugin-1.1
-# tar caf maven-gpg-plugin-1.1.tar.xz maven-gpg-plugin-1.1
-Source0: %{name}-%{version}.tar.xz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: plexus-utils
BuildRequires: ant-nodeps
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-install-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-plugin-plugin
@@ -25,7 +22,7 @@ BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
-Requires: maven2
+Requires: maven
Requires: jpackage-utils
Requires: java
Requires: gnupg2
@@ -48,29 +45,15 @@ Requires: jpackage-utils
%description javadoc
API documentation for %{name}.
-
%prep
-%setup -q #You may need to update this according to your Source0
+%setup -q
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-# tests are skipped because we need new maven to actually execute
-# them. Remove when maven-2.2.x is done.
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven.test.skip=true \
- install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
%install
-rm -rf %{buildroot}
-
# jars
-install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
%add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
@@ -89,9 +72,6 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-rm -rf %{buildroot}
-
%files
%defattr(-,root,root,-)
%{_javadir}/*
@@ -104,6 +84,10 @@ rm -rf %{buildroot}
%{_javadocdir}/%{name}
%changelog
+* Fri Mar 25 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.2-1
+- Update to new upstream release.
+- Adapt to current guidelines.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index ae9382e..c19392f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e7a3ae0db3131e26e325b9b0acf41c6e maven-gpg-plugin-1.1.tar.xz
+fb3d2b7c31e11eeb0ac02c30acd41480 maven-gpg-plugin-1.2-source-release.zip
13 years, 1 month