PageRenderTime 40ms CodeModel.GetById 18ms RepoModel.GetById 1ms app.codeStats 0ms

/0003-Make-httpclient-into-bundle.patch

#
Patch | 97 lines | 89 code | 8 blank | 0 comment | 0 complexity | a177f9dc7a6a2c78d915f0b3229a497a MD5 | raw file
Possible License(s): Apache-2.0
  1. From ff696dac1e539854085b48c51d9d315ab94e469c Mon Sep 17 00:00:00 2001
  2. From: Stanislav Ochotnicky <sochotnicky@redhat.com>
  3. Date: Thu, 1 Mar 2012 11:39:52 +0100
  4. Subject: [PATCH 3/3] Make httpclient into bundle
  5. Also remove few build deps we don't have
  6. ---
  7. httpclient/pom.xml | 47 +++++++++++++++++++----------------------------
  8. 1 files changed, 19 insertions(+), 28 deletions(-)
  9. diff --git a/httpclient/pom.xml b/httpclient/pom.xml
  10. index 0e391f6..f0c6632 100644
  11. --- a/httpclient/pom.xml
  12. +++ b/httpclient/pom.xml
  13. @@ -38,7 +38,7 @@
  14. HttpComponents Client (base module)
  15. </description>
  16. <url>http://hc.apache.org/httpcomponents-client</url>
  17. - <packaging>jar</packaging>
  18. + <packaging>bundle</packaging>
  19. <dependencies>
  20. <dependency>
  21. @@ -65,12 +65,6 @@
  22. <version>${junit.version}</version>
  23. <scope>test</scope>
  24. </dependency>
  25. - <dependency>
  26. - <groupId>org.mockito</groupId>
  27. - <artifactId>mockito-core</artifactId>
  28. - <version>${mockito.version}</version>
  29. - <scope>test</scope>
  30. - </dependency>
  31. </dependencies>
  32. <properties>
  33. @@ -116,25 +110,21 @@
  34. </execution>
  35. </executions>
  36. </plugin>
  37. - <plugin>
  38. - <groupId>com.atlassian.maven.plugins</groupId>
  39. - <artifactId>maven-clover2-plugin</artifactId>
  40. + <plugin>
  41. + <groupId>org.apache.felix</groupId>
  42. + <artifactId>maven-bundle-plugin</artifactId>
  43. + <extensions>true</extensions>
  44. <configuration>
  45. - <flushPolicy>threaded</flushPolicy>
  46. - <flushInterval>100</flushInterval>
  47. - <targetPercentage>50%</targetPercentage>
  48. + <instructions>
  49. + <Export-Package>org.apache.http.*,!org.apache.http.param</Export-Package>
  50. + <Private-Package></Private-Package>
  51. + <_nouses>true</_nouses>
  52. + <Import-Package>!org.apache.avalon.framework.logger,!org.apache.log,!org.apache.log4j,*</Import-Package>
  53. + </instructions>
  54. + <excludeDependencies>true</excludeDependencies>
  55. </configuration>
  56. - <executions>
  57. - <execution>
  58. - <id>site</id>
  59. - <phase>pre-site</phase>
  60. - <goals>
  61. - <goal>instrument</goal>
  62. - </goals>
  63. - </execution>
  64. - </executions>
  65. - </plugin>
  66. - </plugins>
  67. + </plugin>
  68. + </plugins>
  69. </build>
  70. <reporting>
  71. @@ -161,11 +149,14 @@
  72. </plugin>
  73. <plugin>
  74. - <groupId>com.atlassian.maven.plugins</groupId>
  75. - <artifactId>maven-clover2-plugin</artifactId>
  76. - <version>${clover.version}</version>
  77. + <groupId>org.apache.felix</groupId>
  78. + <artifactId>maven-bundle-plugin</artifactId>
  79. <configuration>
  80. - <jdk>1.5</jdk>
  81. + <instructions>
  82. + <Export-Package>*</Export-Package>
  83. + <Private-Package></Private-Package>
  84. + <Import-Package>!org.apache.avalon.framework.logger,!org.apache.log,!org.apache.log4j,*</Import-Package>
  85. + </instructions>
  86. </configuration>
  87. </plugin>
  88. --
  89. 1.7.7.6