API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Jun 28th, 2012
74
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 7.68 KB | None | 0 0
raw download clone embed print report
  1. commit 968398c97e411a4589111aa3c49639a9ab05aa0b (HEAD, master)
  2. Author: Mikolaj Izdebski <mizdebsk@redhat.com>
  3. Date:   Thu Jun 28 15:01:08 2012 +0200
  4.  
  5.     Install aether-connector-asynchttpclient - it was build but not installed.
  6.  
  7. diff --git a/0001-Remove-sonatype-test-dependencies.patch b/0001-Remove-sonatype-test-dependencies.patch
  8. deleted file mode 100644
  9. index 958f90f..0000000
  10. --- a/0001-Remove-sonatype-test-dependencies.patch
  11. +++ /dev/null
  12. @@ -1,46 +0,0 @@
  13. -From d03b97292c144260f824c4918174b153b632aa02 Mon Sep 17 00:00:00 2001
  14. -From: Stanislav Ochotnicky <sochotnicky@redhat.com>
  15. -Date: Fri, 25 Feb 2011 14:52:23 +0100
  16. -Subject: [PATCH 1/3] Remove sonatype test dependencies
  17. -
  18. ----
  19. - aether-connector-asynchttpclient/pom.xml |   23 -----------------------
  20. - 1 files changed, 0 insertions(+), 23 deletions(-)
  21. -
  22. -diff --git a/aether-connector-asynchttpclient/pom.xml b/aether-connector-asynchttpclient/pom.xml
  23. -index f9ee05d..2dd2849 100644
  24. ---- a/aether-connector-asynchttpclient/pom.xml
  25. -+++ b/aether-connector-asynchttpclient/pom.xml
  26. -@@ -52,29 +52,6 @@
  27. -       <artifactId>aether-test-util</artifactId>
  28. -       <scope>test</scope>
  29. -     </dependency>
  30. --    <dependency>
  31. --      <groupId>org.sonatype.sisu</groupId>
  32. --      <artifactId>sisu-inject-plexus</artifactId>
  33. --      <scope>test</scope>
  34. --    </dependency>
  35. --    <dependency>
  36. --      <groupId>org.mortbay.jetty</groupId>
  37. --      <artifactId>jetty</artifactId>
  38. --      <version>6.1.25</version>
  39. --      <scope>test</scope>
  40. --    </dependency>
  41. --    <dependency>
  42. --      <groupId>org.sonatype.http-testing-harness</groupId>
  43. --      <artifactId>junit-runner</artifactId>
  44. --      <version>0.4.1</version>
  45. --      <scope>test</scope>
  46. --    </dependency>
  47. --    <dependency>
  48. --      <groupId>org.sonatype.http-testing-harness</groupId>
  49. --      <artifactId>server-provider</artifactId>
  50. --      <version>0.4.1</version>
  51. --      <scope>test</scope>
  52. --    </dependency>
  53. -   </dependencies>
  54. -
  55. -   <build>
  56. ---
  57. -1.7.7.6
  58. -
  59. diff --git a/0002-Remove-clirr-plugin.patch b/0002-Remove-clirr-plugin.patch
  60. deleted file mode 100644
  61. index 2b99489..0000000
  62. --- a/0002-Remove-clirr-plugin.patch
  63. +++ /dev/null
  64. @@ -1,85 +0,0 @@
  65. -From ff3882c600b2c3b376eed773de39f135e81c129f Mon Sep 17 00:00:00 2001
  66. -From: Stanislav Ochotnicky <sochotnicky@redhat.com>
  67. -Date: Tue, 31 Jan 2012 12:46:44 +0100
  68. -Subject: [PATCH 2/3] Remove clirr plugin
  69. -
  70. ----
  71. - aether-api/pom.xml  |    4 ----
  72. - aether-spi/pom.xml  |    4 ----
  73. - aether-util/pom.xml |    4 ----
  74. - pom.xml             |   14 --------------
  75. - 4 files changed, 0 insertions(+), 26 deletions(-)
  76. -
  77. -diff --git a/aether-api/pom.xml b/aether-api/pom.xml
  78. -index bd34644..a2a7bc1 100644
  79. ---- a/aether-api/pom.xml
  80. -+++ b/aether-api/pom.xml
  81. -@@ -38,10 +38,6 @@
  82. -         <groupId>org.codehaus.mojo</groupId>
  83. -         <artifactId>animal-sniffer-maven-plugin</artifactId>
  84. -       </plugin>
  85. --      <plugin>
  86. --        <groupId>org.codehaus.mojo</groupId>
  87. --        <artifactId>clirr-maven-plugin</artifactId>
  88. --      </plugin>
  89. -     </plugins>
  90. -   </build>
  91. - </project>
  92. -diff --git a/aether-spi/pom.xml b/aether-spi/pom.xml
  93. -index 3b19a36..53fb5e0 100644
  94. ---- a/aether-spi/pom.xml
  95. -+++ b/aether-spi/pom.xml
  96. -@@ -37,10 +37,6 @@
  97. -         <groupId>org.codehaus.mojo</groupId>
  98. -         <artifactId>animal-sniffer-maven-plugin</artifactId>
  99. -       </plugin>
  100. --      <plugin>
  101. --        <groupId>org.codehaus.mojo</groupId>
  102. --        <artifactId>clirr-maven-plugin</artifactId>
  103. --      </plugin>
  104. -     </plugins>
  105. -   </build>
  106. - </project>
  107. -diff --git a/aether-util/pom.xml b/aether-util/pom.xml
  108. -index e52c2f8..ae3d218 100644
  109. ---- a/aether-util/pom.xml
  110. -+++ b/aether-util/pom.xml
  111. -@@ -47,10 +47,6 @@
  112. -         <groupId>org.codehaus.mojo</groupId>
  113. -         <artifactId>animal-sniffer-maven-plugin</artifactId>
  114. -       </plugin>
  115. --      <plugin>
  116. --        <groupId>org.codehaus.mojo</groupId>
  117. --        <artifactId>clirr-maven-plugin</artifactId>
  118. --      </plugin>
  119. -     </plugins>
  120. -   </build>
  121. - </project>
  122. -diff --git a/pom.xml b/pom.xml
  123. -index 1f13aa4..02cc979 100644
  124. ---- a/pom.xml
  125. -+++ b/pom.xml
  126. -@@ -211,20 +211,6 @@
  127. -           </executions>
  128. -         </plugin>
  129. -         <plugin>
  130. --          <groupId>org.codehaus.mojo</groupId>
  131. --          <artifactId>clirr-maven-plugin</artifactId>
  132. --          <version>2.3</version>
  133. --          <executions>
  134. --            <execution>
  135. --              <id>check-api-compat</id>
  136. --              <phase>verify</phase>
  137. --              <goals>
  138. --                <goal>check-no-fork</goal>
  139. --              </goals>
  140. --            </execution>
  141. --          </executions>
  142. --        </plugin>
  143. --        <plugin>
  144. -           <groupId>org.codehaus.plexus</groupId>
  145. -           <artifactId>plexus-component-metadata</artifactId>
  146. -           <version>1.5.5</version>
  147. ---
  148. -1.7.7.6
  149. -
  150. diff --git a/0003-Remove-some-test-deps-for-skipped-tests.patch b/0003-Remove-some-test-deps-for-skipped-tests.patch
  151. deleted file mode 100644
  152. index 931ef7d..0000000
  153. --- a/0003-Remove-some-test-deps-for-skipped-tests.patch
  154. +++ /dev/null
  155. @@ -1,40 +0,0 @@
  156. -From 88ce9b79cc96d44df4eaaecb6565d67d7f75faed Mon Sep 17 00:00:00 2001
  157. -From: Stanislav Ochotnicky <sochotnicky@redhat.com>
  158. -Date: Tue, 31 Jan 2012 12:52:01 +0100
  159. -Subject: [PATCH 3/3] Remove some test deps for skipped tests
  160. -
  161. ----
  162. - aether-connector-wagon/pom.xml |   17 -----------------
  163. - 1 files changed, 0 insertions(+), 17 deletions(-)
  164. -
  165. -diff --git a/aether-connector-wagon/pom.xml b/aether-connector-wagon/pom.xml
  166. -index 465e811..dfd9f60 100644
  167. ---- a/aether-connector-wagon/pom.xml
  168. -+++ b/aether-connector-wagon/pom.xml
  169. -@@ -65,23 +65,6 @@
  170. -       <groupId>org.sonatype.sisu</groupId>
  171. -       <artifactId>sisu-inject-plexus</artifactId>
  172. -     </dependency>
  173. --    <dependency>
  174. --      <groupId>org.sonatype.aether</groupId>
  175. --      <artifactId>aether-test-util</artifactId>
  176. --      <scope>test</scope>
  177. --    </dependency>
  178. --    <dependency>
  179. --      <groupId>org.apache.maven.wagon</groupId>
  180. --      <artifactId>wagon-http-lightweight</artifactId>
  181. --      <version>${wagonVersion}</version>
  182. --      <scope>test</scope>
  183. --    </dependency>
  184. --    <dependency>
  185. --      <groupId>org.sonatype.http-testing-harness</groupId>
  186. --      <artifactId>server-provider</artifactId>
  187. --      <version>0.4.1</version>
  188. --      <scope>test</scope>
  189. --    </dependency>
  190. -   </dependencies>
  191. -
  192. -   <build>
  193. ---
  194. -1.7.7.6
  195. -
  196. diff --git a/aether.spec b/aether.spec
  197. index 121807f..7cad452 100644
  198. --- a/aether.spec
  199. +++ b/aether.spec
  200. @@ -10,9 +10,6 @@ URL:            https://docs.sonatype.org/display/AETHER/Home
  201.  # git archive --prefix="aether-1.11/" --format=tar aether-1.11 | bzip2 > aether-1.11.tar.bz2
  202.  Source0:        %{name}-%{version}.tar.bz2
  203.  
  204. -Patch0:         0001-Remove-sonatype-test-dependencies.patch
  205. -Patch1:         0002-Remove-clirr-plugin.patch
  206. -Patch2:         0003-Remove-some-test-deps-for-skipped-tests.patch
  207.  BuildArch:      noarch
  208.  
  209.  BuildRequires:  maven
  210. @@ -56,12 +53,17 @@ Requires:  jpackage-utils
  211.  
  212.  # we'd need org.sonatype.http-testing-harness so let's remove async
  213.  # and wagon http tests (leave others enabled)
  214. -%patch0 -p1
  215. -%patch1 -p1
  216. -%patch2 -p1
  217. -
  218. -rm -rf aether-connector-asynchttpclient/src/test
  219. -rm -rf aether-connector-wagon/src/test
  220. +for module in asynchttpclient wagon; do (
  221. +    cd ./aether-connector-$module
  222. +    rm -rf src/test
  223. +    # Removes all dependencies with test scope
  224. +    %pom_xpath_remove "pom:dependency[pom:scope[text()='test']]"
  225. +) done
  226. +
  227. +# Remove clirr plugin
  228. +%pom_remove_plugin :clirr-maven-plugin
  229. +%pom_remove_plugin :clirr-maven-plugin aether-api
  230. +%pom_remove_plugin :clirr-maven-plugin aether-spi
  231.  
  232.  %build
  233.  mvn-rpmbuild install javadoc:aggregate
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!