This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository httpcomponents-client.
commit 66c5c52ed3b9cc9b331dd21d34574f507082978f Author: Emmanuel Bourg <[email protected]> Date: Wed Jan 29 18:45:54 2014 +0100 New upstream release (4.3.2) Refreshed the patches New build dependency on libbuild-helper-maven-plugin-java --- debian/changelog | 5 +++- debian/control | 3 ++- debian/maven.ignoreRules | 1 + debian/patches/00-fix_build.patch | 17 ++++--------- debian/patches/01-generate_osgi_metadata.patch | 35 ++++++++------------------ 5 files changed, 22 insertions(+), 39 deletions(-) diff --git a/debian/changelog b/debian/changelog index 17212fe..795e0f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ -httpcomponents-client (4.2.5-3) UNRELEASED; urgency=low +httpcomponents-client (4.3.2-1) UNRELEASED; urgency=low + * New upstream release + - Refreshed the patches + - New build dependency on libbuild-helper-maven-plugin-java * Removed the unused dependency on libapache-mime4j-java * Switch to debhelper level 9 * Standards-Version updated to 3.9.5 (no changes) diff --git a/debian/control b/debian/control index 7be3e84..2f3de85 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,9 @@ Build-Depends: debhelper (>= 9), maven-debian-helper, maven-repo-helper Build-Depends-Indep: junit, + libbuild-helper-maven-plugin-java (>= 1.8), libcommons-codec-java, - libhttpcore-java (>= 4.2.1), + libhttpcore-java (>= 4.3.1), libmaven-antrun-plugin-java, libmaven-assembly-plugin-java, libmaven-bundle-plugin-java, diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 568486e..c8b81ed 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -15,6 +15,7 @@ # junit junit jar s/3\..*/3.x/ org.apache.httpcomponents httpclient jar * tests * +* maven-checkstyle-plugin * maven-clover2-plugin * maven-source-plugin * maven-release-plugin diff --git a/debian/patches/00-fix_build.patch b/debian/patches/00-fix_build.patch index f3d146f..7772c40 100644 --- a/debian/patches/00-fix_build.patch +++ b/debian/patches/00-fix_build.patch @@ -1,22 +1,15 @@ -From: David Paleino <[email protected]> -Subject: disable build of httpclient-osgi +Description: Disable build of httpclient-osgi +Author: David Paleino <[email protected]> Forwarded: no - ---- - pom.xml | 2 ++ - 1 file changed, 2 insertions(+) - --- a/pom.xml +++ b/pom.xml -@@ -153,9 +153,9 @@ - <modules> +@@ -163,9 +163,7 @@ <module>httpclient</module> <module>httpmime</module> -- <module>httpclient-cache</module> -+<!-- <module>httpclient-cache</module> --> <module>fluent-hc</module> +- <module>httpclient-cache</module> + <!--module>httpclient-win</module--> - <module>httpclient-osgi</module> -+<!-- <module>httpclient-osgi</module> --> </modules> <build> diff --git a/debian/patches/01-generate_osgi_metadata.patch b/debian/patches/01-generate_osgi_metadata.patch index ff108ec..75cc728 100644 --- a/debian/patches/01-generate_osgi_metadata.patch +++ b/debian/patches/01-generate_osgi_metadata.patch @@ -6,47 +6,33 @@ Subject: generate-osgi-metadata httpclient/pom.xml | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) -diff --git a/httpclient/pom.xml b/httpclient/pom.xml -index 9f95614..e780c9a 100644 --- a/httpclient/pom.xml +++ b/httpclient/pom.xml -@@ -103,13 +103,11 @@ +@@ -98,13 +98,38 @@ </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId> -- <executions> -- <execution> -- <goals> -- <goal>test-jar</goal> -- </goals> -- </execution> -- </executions> + <configuration> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + </archive> + </configuration> - </plugin> - <plugin> - <groupId>com.atlassian.maven.plugins</groupId> -@@ -129,6 +127,33 @@ - </execution> - </executions> - </plugin> ++ </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.5</version> + <extensions>true</extensions> -+ <executions> -+ <execution> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>process-classes</phase> -+ <goals> + <goals> +- <goal>test-jar</goal> + <goal>manifest</goal> -+ </goals> -+ </execution> -+ </executions> + </goals> + </execution> + </executions> + <configuration> + <instructions> + <Bundle-Name>Apache ${project.name}</Bundle-Name> @@ -59,7 +45,6 @@ index 9f95614..e780c9a 100644 + <_removeheaders>JAVA_1_3_HOME,JAVA_1_4_HOME</_removeheaders> + </instructions> + </configuration> -+ </plugin> + </plugin> </plugins> </build> - -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/httpcomponents-client.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
