Skip to content

Commit 6fa5f05

Browse files
skahmannskahmann
committed
Replaced httpclient and httpcore with osgi bundles
1 parent 648ca1f commit 6fa5f05

File tree

2 files changed

+25
-42
lines changed

2 files changed

+25
-42
lines changed

‎core/pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@
5050
<artifactId>sesame-rio-nquads</artifactId>
5151
<scope>test</scope>
5252
</dependency>
53-
<dependency>
54-
<groupId>org.apache.httpcomponents</groupId>
55-
<artifactId>httpclient-cache</artifactId>
56-
</dependency>
57-
<dependency>
58-
<groupId>org.apache.httpcomponents</groupId>
59-
<artifactId>httpclient</artifactId>
60-
</dependency>
61-
<!-- NOTE: Exclude this as a dependency if you are using slf4j-jcl. It
53+
<dependency>
54+
<groupId>org.apache.httpcomponents</groupId>
55+
<artifactId>httpclient-osgi</artifactId>
56+
</dependency>
57+
<dependency>
58+
<groupId>org.apache.httpcomponents</groupId>
59+
<artifactId>httpcore-osgi</artifactId>
60+
</dependency>
61+
<!-- NOTE: Exclude this as a dependency if you are using slf4j-jcl. It
6262
is necessary here to avoid ClassNotFoundErrors in httpclient -->
6363
<dependency>
6464
<groupId>org.slf4j</groupId>

‎pom.xml‎

Lines changed: 16 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -134,39 +134,22 @@
134134
<version>${slf4j.version}</version>
135135
<scope>test</scope>
136136
</dependency>
137-
<dependency>
138-
<groupId>org.apache.httpcomponents</groupId>
139-
<artifactId>httpclient</artifactId>
140-
<version>${httpclient.version}</version>
141-
<exclusions>
142-
<exclusion>
143-
<artifactId>commons-logging</artifactId>
144-
<groupId>commons-logging</groupId>
145-
</exclusion>
146-
</exclusions>
147-
</dependency>
148-
<dependency>
149-
<groupId>org.apache.httpcomponents</groupId>
150-
<artifactId>httpclient-cache</artifactId>
151-
<version>${httpclient.version}</version>
152-
<exclusions>
153-
<exclusion>
154-
<artifactId>commons-logging</artifactId>
155-
<groupId>commons-logging</groupId>
156-
</exclusion>
157-
</exclusions>
158-
</dependency>
159-
<dependency>
160-
<groupId>org.apache.httpcomponents</groupId>
161-
<artifactId>httpcore</artifactId>
162-
<version>${httpclient.version}</version>
163-
<exclusions>
164-
<exclusion>
165-
<artifactId>commons-logging</artifactId>
166-
<groupId>commons-logging</groupId>
167-
</exclusion>
168-
</exclusions>
169-
</dependency>
137+
<dependency>
138+
<groupId>org.apache.httpcomponents</groupId>
139+
<artifactId>httpclient-osgi</artifactId>
140+
<version>4.2.5</version>
141+
<exclusions>
142+
<exclusion>
143+
<artifactId>commons-logging</artifactId>
144+
<groupId>commons-logging</groupId>
145+
</exclusion>
146+
</exclusions>
147+
</dependency>
148+
<dependency>
149+
<groupId>org.apache.httpcomponents</groupId>
150+
<artifactId>httpcore-osgi</artifactId>
151+
<version>4.2.5</version>
152+
</dependency>
170153
<dependency>
171154
<groupId>org.mockito</groupId>
172155
<artifactId>mockito-core</artifactId>

0 commit comments

Comments
 (0)