1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
|
From: David Paleino <dapal@debian.org>
Subject: remove more-or-less useless, or unnecessary (and not packaged)
dependencies
Forwarded: not-needed
---
httpcore-nio/pom.xml | 19 +------------------
httpcore/pom.xml | 19 +------------------
pom.xml | 37 ++++---------------------------------
3 files changed, 6 insertions(+), 69 deletions(-)
--- httpcomponents-core.orig/pom.xml
+++ httpcomponents-core/pom.xml
@@ -25,12 +25,6 @@
<http://www.apache.org />.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>project</artifactId>
- <groupId>org.apache.httpcomponents</groupId>
- <version>5</version>
- <relativePath>../project/pom.xml</relativePath>
- </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcomponents-core</artifactId>
@@ -68,7 +62,7 @@
<modules>
<module>httpcore</module>
<module>httpcore-nio</module>
- <module>httpcore-osgi</module>
+<!-- <module>httpcore-osgi</module> -->
</modules>
<properties>
@@ -91,21 +85,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-notice-plugin</artifactId>
- <groupId>org.apache.httpcomponents</groupId>
- <executions>
- <execution>
- <id>attach-notice-license</id>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <projectTitle>Apache HttpComponents</projectTitle>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
@@ -123,17 +102,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<!-- reduce console output. Can override with -Dquiet=false -->
@@ -149,6 +117,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
@@ -178,6 +147,7 @@
</tasks>
</configuration>
</plugin>
+ <!--
<plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
@@ -242,6 +212,7 @@
</execution>
</executions>
</plugin>
+ -->
</plugins>
</build>
--- httpcomponents-core.orig/httpcore-nio/pom.xml
+++ httpcomponents-core/httpcore-nio/pom.xml
@@ -50,6 +50,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>3.x</version>
</dependency>
</dependencies>
@@ -86,24 +87,6 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
</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>
</build>
--- httpcomponents-core.orig/httpcore/pom.xml
+++ httpcomponents-core/httpcore/pom.xml
@@ -59,6 +59,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>3.x</version>
</dependency>
</dependencies>
@@ -92,24 +93,6 @@
<jvm>${httpcore.surefire.java}</jvm>
</configuration>
</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>
</build>
|
