Skip to content

Commit 0818539

Browse files
ansellansell
committed
bump dependency versions, and specify all httpclient dependencies to work around possible issues
in particular, httpclient-osgi incorrectly has a "scope=provided" dependency on httpcore-osgi which tells maven that it should not attempt to pull in the dependency. in order to make jsonld-java work for non-osgi users, we need to specify all of the necessary dependencies ourselves to work around this.
1 parent a6c0a99 commit 0818539

File tree

3 files changed

+104
-23
lines changed

3 files changed

+104
-23
lines changed

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,9 @@ Once you've `commit`ted your code, and `push`ed it into your github fork you can
387387
CHANGELOG
388388
=========
389389

390+
### 2015-11-16
391+
* Bump dependencies to latest versions, particularly HTTPClient that is seeing more use on 4.5/4.4 than the 4.2 series that we have used so far
392+
390393
### 2015-09-30
391394
* Release 0.7.0
392395

‎core/pom.xml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,28 @@
2121
<groupId>com.fasterxml.jackson.core</groupId>
2222
<artifactId>jackson-databind</artifactId>
2323
</dependency>
24+
<dependency>
25+
<groupId>org.apache.httpcomponents</groupId>
26+
<artifactId>httpclient-osgi</artifactId>
27+
</dependency>
28+
<dependency>
29+
<groupId>org.apache.httpcomponents</groupId>
30+
<artifactId>httpcore-osgi</artifactId>
31+
</dependency>
2432
<dependency>
2533
<groupId>org.slf4j</groupId>
2634
<artifactId>slf4j-api</artifactId>
2735
</dependency>
36+
<!-- NOTE: Exclude this as a dependency if you are using slf4j-jcl. It
37+
is necessary here to avoid ClassNotFoundErrors in httpclient -->
38+
<dependency>
39+
<groupId>org.slf4j</groupId>
40+
<artifactId>jcl-over-slf4j</artifactId>
41+
</dependency>
42+
<dependency>
43+
<groupId>commons-io</groupId>
44+
<artifactId>commons-io</artifactId>
45+
</dependency>
2846
<dependency>
2947
<groupId>junit</groupId>
3048
<artifactId>junit</artifactId>
@@ -40,24 +58,6 @@
4058
<artifactId>mockito-core</artifactId>
4159
<scope>test</scope>
4260
</dependency>
43-
<dependency>
44-
<groupId>org.apache.httpcomponents</groupId>
45-
<artifactId>httpclient-osgi</artifactId>
46-
</dependency>
47-
<dependency>
48-
<groupId>org.apache.httpcomponents</groupId>
49-
<artifactId>httpcore-osgi</artifactId>
50-
</dependency>
51-
<!-- NOTE: Exclude this as a dependency if you are using slf4j-jcl. It
52-
is necessary here to avoid ClassNotFoundErrors in httpclient -->
53-
<dependency>
54-
<groupId>org.slf4j</groupId>
55-
<artifactId>jcl-over-slf4j</artifactId>
56-
</dependency>
57-
<dependency>
58-
<groupId>commons-io</groupId>
59-
<artifactId>commons-io</artifactId>
60-
</dependency>
6161
</dependencies>
6262
<build>
6363
<plugins>

‎pom.xml‎

Lines changed: 83 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,11 @@
3939
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4040
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4141

42-
<httpclient.version>4.2.5</httpclient.version>
43-
<jackson.version>2.3.3</jackson.version>
42+
<httpclient.version>4.5.1</httpclient.version>
43+
<httpcore.version>4.4.4</httpcore.version>
44+
<jackson.version>2.6.3</jackson.version>
4445
<junit.version>4.12</junit.version>
45-
<slf4j.version>1.7.9</slf4j.version>
46+
<slf4j.version>1.7.13</slf4j.version>
4647
</properties>
4748
<prerequisites>
4849
<maven>3.0.0</maven>
@@ -106,13 +107,90 @@
106107
</dependency>
107108
<dependency>
108109
<groupId>org.apache.httpcomponents</groupId>
109-
<artifactId>httpcore-osgi</artifactId>
110+
<artifactId>httpclient</artifactId>
111+
<version>${httpclient.version}</version>
112+
<exclusions>
113+
<exclusion>
114+
<artifactId>commons-logging</artifactId>
115+
<groupId>commons-logging</groupId>
116+
</exclusion>
117+
</exclusions>
118+
</dependency>
119+
<dependency>
120+
<groupId>org.apache.httpcomponents</groupId>
121+
<artifactId>httpclient-cache</artifactId>
122+
<version>${httpclient.version}</version>
123+
<exclusions>
124+
<exclusion>
125+
<artifactId>commons-logging</artifactId>
126+
<groupId>commons-logging</groupId>
127+
</exclusion>
128+
</exclusions>
129+
</dependency>
130+
<dependency>
131+
<groupId>org.apache.httpcomponents</groupId>
132+
<artifactId>fluent-hc</artifactId>
110133
<version>${httpclient.version}</version>
134+
<exclusions>
135+
<exclusion>
136+
<artifactId>commons-logging</artifactId>
137+
<groupId>commons-logging</groupId>
138+
</exclusion>
139+
</exclusions>
140+
</dependency>
141+
<dependency>
142+
<groupId>org.apache.httpcomponents</groupId>
143+
<artifactId>httpmime</artifactId>
144+
<version>${httpclient.version}</version>
145+
<exclusions>
146+
<exclusion>
147+
<artifactId>commons-logging</artifactId>
148+
<groupId>commons-logging</groupId>
149+
</exclusion>
150+
</exclusions>
151+
</dependency>
152+
<dependency>
153+
<groupId>org.apache.httpcomponents</groupId>
154+
<artifactId>httpcore-osgi</artifactId>
155+
<version>${httpcore.version}</version>
156+
<exclusions>
157+
<exclusion>
158+
<artifactId>commons-logging</artifactId>
159+
<groupId>commons-logging</groupId>
160+
</exclusion>
161+
</exclusions>
162+
</dependency>
163+
<dependency>
164+
<groupId>org.apache.httpcomponents</groupId>
165+
<artifactId>httpcore</artifactId>
166+
<version>${httpcore.version}</version>
167+
<exclusions>
168+
<exclusion>
169+
<artifactId>commons-logging</artifactId>
170+
<groupId>commons-logging</groupId>
171+
</exclusion>
172+
</exclusions>
173+
</dependency>
174+
<dependency>
175+
<groupId>org.apache.httpcomponents</groupId>
176+
<artifactId>httpcore-nio</artifactId>
177+
<version>${httpcore.version}</version>
178+
<exclusions>
179+
<exclusion>
180+
<artifactId>commons-logging</artifactId>
181+
<groupId>commons-logging</groupId>
182+
</exclusion>
183+
</exclusions>
184+
</dependency>
185+
<dependency>
186+
<groupId>commons-codec</groupId>
187+
<artifactId>commons-codec</artifactId>
188+
<version>1.10</version>
111189
</dependency>
112190
<dependency>
113191
<groupId>org.mockito</groupId>
114192
<artifactId>mockito-core</artifactId>
115-
<version>1.10.17</version>
193+
<version>1.10.19</version>
116194
</dependency>
117195
<dependency>
118196
<groupId>commons-io</groupId>

0 commit comments

Comments
 (0)