java-sig-commits March 2011

java-sig-commits@lists.fedoraproject.org

7 participants
89 discussions

[maven/f15/master] Update to 3.0.3
by Stanislav Ochotnicky 16 Mar '11

16 Mar '11

Summary of changes: 49f4ff0... Update to 3.0.3 (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[httpcomponents-project/f15/master] Require maven (version 3) now.
by Alexander Kurtakov 15 Mar '11

15 Mar '11

Summary of changes: 436d278... Require maven (version 3) now. (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[httpcomponents-core/f15/master: 3/3] - Merge rawhide changes (i.e. set PrivatePackage to empty explicitly).
by jerboaa 15 Mar '11

15 Mar '11

commit 7ffcfde447b9f096dc42e309768c23946db37f44 Author: Severin Gehwolf <sgehwolf(a)redhat.com> Date: Tue Mar 15 11:38:26 2011 -0400 - Merge rawhide changes (i.e. set PrivatePackage to empty explicitly). httpcomponents-core.spec | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) --- diff --git a/httpcomponents-core.spec b/httpcomponents-core.spec index b4bc40a..4d07e6e 100644 --- a/httpcomponents-core.spec +++ b/httpcomponents-core.spec @@ -3,7 +3,7 @@ Name: httpcomponents-core Summary: Set of low level Java HTTP transport components for HTTP services Version: 4.1 -Release: 6%{?dist} +Release: 4%{?dist} Group: Development/Libraries License: ASL 2.0 URL: http://hc.apache.org/ @@ -97,12 +97,8 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name} %doc %{_javadocdir}/* %changelog -* 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. - -* Fri Mar 11 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-5 -- Bump release to fix my mistake with the release. +* Tue Mar 15 2011 Severin Gehwolf <sgehwolf(a)redhat.com> 4.1-4 +- Merge rawhide changes (i.e. set PrivatePackage to empty explicitly). * Thu Mar 10 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-3 - Export all packages.

1 0

[httpcomponents-core/f15/master] (3 commits) ...- Merge rawhide changes (i.e. set PrivatePackage to empty explicitly).
by jerboaa 15 Mar '11

15 Mar '11

Summary of changes: 578200f... Bump release to fix my mistake with the release. (*) 3df7208... - Explicitly set PrivatePackage to the empty set, so as to (*) 7ffcfde... - Merge rawhide changes (i.e. set PrivatePackage to empty e (*) This commit already existed in another branch; no separate mail sent

1 0

[httpcomponents-client: 2/2] Merge branch 'refs/heads/master' of git://pkgs.fedoraproject.org/httpcomponents-client.git
by jerboaa 15 Mar '11

15 Mar '11

commit 25bcb434bb6a7cd993d3c5929e1c84997071c00b Merge: 387cfa6 8e3aaf5 Author: Severin Gehwolf <sgehwolf(a)redhat.com> Date: Tue Mar 15 10:47:58 2011 -0400 Merge branch 'refs/heads/master' of git://pkgs.fedoraproject.org/httpcomponents-client.git httpcomponents-client.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- diff --cc httpcomponents-client.spec index 1c6a3b1,3cce83e..cc8553a --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@@ -3,7 -3,7 +3,7 @@@ Name: httpcomponents-client Summary: HTTP agent implementation based on httpcomponents HttpCore Version: 4.1 --Release: 5%{?dist} ++Release: 6%{?dist} Group: Development/Libraries License: ASL 2.0 URL: http://hc.apache.org/ @@@ -92,10 -92,9 +92,13 @@@ cp -pr target/site/api*/* %{buildroot}% %changelog - * Tue Mar 15 2011 Severin Gehwolf <sgehwolf(a)redhat.com> 4.1-5 ++* 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. + + * Thu Mar 10 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-5 + - OSGi export more packages. + * Fri Feb 25 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-4 - Build httpmime module.

1 0

[httpcomponents-client: 1/2] - Explicitly set PrivatePackage to the empty set, so as to export all packages.
by jerboaa 15 Mar '11

15 Mar '11

commit 387cfa68cf8ace9f49c9ce97eaed94341e476fd2 Author: Severin Gehwolf <sgehwolf(a)redhat.com> Date: Tue Mar 15 10:41:59 2011 -0400 - Explicitly set PrivatePackage to the empty set, so as to export all packages. 0001-Cleanup-pom.patch | 154 ++++++++++++++++++++++--------------------- httpcomponents-client.spec | 6 ++- 2 files changed, 84 insertions(+), 76 deletions(-) --- diff --git a/0001-Cleanup-pom.patch b/0001-Cleanup-pom.patch index ac7b967..a3ba083 100644 --- a/0001-Cleanup-pom.patch +++ b/0001-Cleanup-pom.patch @@ -1,76 +1,5 @@ ---- httpclient/pom.xml.sav 2011-01-17 22:00:53.000000000 +0200 -+++ httpclient/pom.xml 2011-02-18 13:38:36.221371560 +0200 -@@ -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,12 @@ - </execution> - </executions> - </plugin> -- <plugin> -- <groupId>com.atlassian.maven.plugins</groupId> -- <artifactId>maven-clover2-plugin</artifactId> -- <configuration> -- <flushPolicy>threaded</flushPolicy> -- <flushInterval>100</flushInterval> -- <targetPercentage>50%</targetPercentage> -- </configuration> -- <executions> -- <execution> -- <id>site</id> -- <phase>pre-site</phase> -- <goals> -- <goal>instrument</goal> -- </goals> -- </execution> -- </executions> -- </plugin> -- </plugins> -+ <plugin> -+ <groupId>org.apache.felix</groupId> -+ <artifactId>maven-bundle-plugin</artifactId> -+ <extensions>true</extensions> -+ </plugin> -+ </plugins> - </build> - - <reporting> -@@ -165,14 +146,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> - ---- pom.xml.sav 2011-01-17 22:00:53.000000000 +0200 -+++ pom.xml 2011-02-25 20:17:20.519335750 +0200 +--- 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 @@ <modules> <module>httpclient</module> @@ -183,8 +112,83 @@ </reporting> </project> ---- httpmime/pom.xml.sav 2011-01-17 22:00:44.000000000 +0200 -+++ httpmime/pom.xml 2011-02-25 20:19:09.191564653 +0200 +--- 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> diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index b2bf294..1c6a3b1 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -3,7 +3,7 @@ Name: httpcomponents-client Summary: HTTP agent implementation based on httpcomponents HttpCore Version: 4.1 -Release: 4%{?dist} +Release: 5%{?dist} Group: Development/Libraries License: ASL 2.0 URL: http://hc.apache.org/ @@ -92,6 +92,10 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name} %changelog +* Tue Mar 15 2011 Severin Gehwolf <sgehwolf(a)redhat.com> 4.1-5 +- Explicitly set PrivatePackage to the empty set, so as to + export all packages. + * Fri Feb 25 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-4 - Build httpmime module.

1 0

[httpcomponents-client] (2 commits) ...Merge branch 'refs/heads/master' of git://pkgs.fedoraproject.org/httpcomponents-client.git
by jerboaa 15 Mar '11

15 Mar '11

Summary of changes: 387cfa6... - Explicitly set PrivatePackage to the empty set, so as to 25bcb43... Merge branch 'refs/heads/master' of git://pkgs.fedoraprojec

1 0

[httpcomponents-core] - Explicitly set PrivatePackage to the empty set, so as to export all packages.
by jerboaa 15 Mar '11

15 Mar '11

commit 3df720872d91461ab9fa3fb45ee70133f3aae481 Author: Severin Gehwolf <sgehwolf(a)redhat.com> Date: Tue Mar 15 10:31:03 2011 -0400 - Explicitly set PrivatePackage to the empty set, so as to export all packages. httpcomponents-core.spec | 6 +++++- osgify.patch | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) --- diff --git a/httpcomponents-core.spec b/httpcomponents-core.spec index 71a5baa..b4bc40a 100644 --- a/httpcomponents-core.spec +++ b/httpcomponents-core.spec @@ -3,7 +3,7 @@ Name: httpcomponents-core Summary: Set of low level Java HTTP transport components for HTTP services Version: 4.1 -Release: 5%{?dist} +Release: 6%{?dist} Group: Development/Libraries License: ASL 2.0 URL: http://hc.apache.org/ @@ -97,6 +97,10 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name} %doc %{_javadocdir}/* %changelog +* 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. + * Fri Mar 11 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-5 - Bump release to fix my mistake with the release. diff --git a/osgify.patch b/osgify.patch index 5c6afb1..780e89c 100644 --- a/osgify.patch +++ b/osgify.patch @@ -9,7 +9,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> -@@ -111,6 +111,16 @@ +@@ -111,6 +111,17 @@ </archive> </configuration> </plugin> @@ -20,6 +20,7 @@ + <configuration> + <instructions> + <Export-Package>*</Export-Package> ++ <Private-Package></Private-Package> + </instructions> + </configuration> + </plugin>

1 0

[maven-jxr/f15/master] - Maven plug-in sub-package should require the core package. - Use _mavenpomdir macro. - Don't insta
by Mat Booth 13 Mar '11

13 Mar '11

Summary of changes: c6cc9f5... - Maven plug-in sub-package should require the core package (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[maven-jxr] - Maven plug-in sub-package should require the core package. - Use _mavenpomdir macro. - Don't insta
by Mat Booth 13 Mar '11

13 Mar '11

commit c6cc9f5ba8bc7da8838d5d6b8a95bc2bc56adac7 Author: mbooth <fedora(a)matbooth.co.uk> Date: Sun Mar 13 16:40:03 2011 +0000 - Maven plug-in sub-package should require the core package. - Use _mavenpomdir macro. - Don't install versioned javadocs. maven-jxr.spec | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) --- diff --git a/maven-jxr.spec b/maven-jxr.spec index 6481545..6126bb5 100644 --- a/maven-jxr.spec +++ b/maven-jxr.spec @@ -30,7 +30,7 @@ Name: maven-jxr Version: 2.2 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: Source cross referencing tool License: ASL 2.0 @@ -86,6 +86,7 @@ API documentation for %{name}. %package -n maven-plugin-jxr Summary: Maven plugin for JXR Group: Development/Tools +Requires: %{name} = %{version}-%{release} %description -n maven-plugin-jxr Maven plugin for JXR. @@ -114,15 +115,15 @@ mkdir -p $MAVEN_REPO_LOCAL rm -rf $RPM_BUILD_ROOT # jars/poms install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name} -install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/maven2/poms +install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir} install -pm 644 maven-jxr/target/%{name}-%{version}.jar \ $RPM_BUILD_ROOT%{_javadir}/%{name}.jar %add_to_maven_depmap org.apache.maven.jxr jxr %{version} JPP %{name}-parent %add_to_maven_depmap org.apache.maven maven-jxr %{version} JPP %{name} -install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}-parent.pom -install -pm 644 maven-jxr/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom +install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}-parent.pom +install -pm 644 maven-jxr/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom # maven-jxr plugin %add_to_maven_depmap org.apache.maven.plugins maven-jxr-plugin %{version} JPP maven-plugin-jxr @@ -130,15 +131,13 @@ install -pm 644 maven-jxr-plugin/target/maven-jxr-plugin-%{version}.jar \ $RPM_BUILD_ROOT%{_javadir}/maven-plugin-jxr.jar install -pm 644 maven-jxr-plugin/pom.xml \ - $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-maven-plugin-jxr.pom + $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-maven-plugin-jxr.pom # javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} cp -pr target/site/apidocs/* \ - $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ - -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} + $RPM_BUILD_ROOT%{_javadocdir}/%{name}/ %post %update_maven_depmap @@ -152,10 +151,16 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} %postun -n maven-plugin-jxr %update_maven_depmap +%pre javadoc +# workaround for rpm bug, can be removed in F-17 +[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \ +rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : + %files %defattr(-,root,root,-) %{_javadir}/%{name}*.jar -%{_datadir}/maven2 +%{_mavenpomdir}/JPP-%{name}-parent.pom +%{_mavenpomdir}/JPP-%{name}.pom %{_mavendepmapfragdir}/%{name} %files javadoc @@ -164,9 +169,15 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} %files -n maven-plugin-jxr %defattr(-,root,root,-) +%{_mavenpomdir}/JPP-maven-plugin-jxr.pom %{_javadir}/maven-plugin-jxr*.jar %changelog +* Sun Mar 13 2011 Mat Booth <fedora(a)matbooth.co.uk> 0:2.2-3 +- Maven plug-in sub-package should require the core package. +- Use _mavenpomdir macro. +- Don't install versioned javadocs. + * Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

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