Skip to content

Commit 53012df

Browse files
committed
Remove the dependency on Apache HTTP Client
1 parent bc5131e commit 53012df

File tree

4 files changed

+84
-688
lines changed

4 files changed

+84
-688
lines changed

build.gradle

+23-26
Original file line numberDiff line numberDiff line change
@@ -40,29 +40,19 @@ configurations {
4040
}
4141

4242
dependencies {
43-
implementation (
44-
[group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.1.3'],
45-
[group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: '5.1.3']
46-
)
47-
48-
compileOnly (
49-
[group: 'org.slf4j', name: 'slf4j-api', version: '1.7.36' ]
50-
)
51-
5243
validatingImplementation (
5344
[group: 'org.relaxng', name: 'jing', version: '20220510' ]
5445
)
5546

5647
docletImplementation (
5748
[group: 'org.relaxng', name: 'jing', version: '20220510' ],
58-
[group: 'com.saxonica', name: 'xmldoclet', version: '0.1.0']
49+
[group: 'com.saxonica', name: 'xmldoclet', version: '0.4.0']
5950
)
6051

6152
testImplementation (
6253
[group: 'org.junit.jupiter', name: 'junit-jupiter', version: '5.9.2'],
6354
[group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.9.2'],
6455
[group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.9.2'],
65-
[group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.36' ],
6656
// Because reasons: https://blog.adamretter.org.uk/xerces-xsd11-maven/
6757
[group: 'org.exist-db.thirdparty.xerces', name: 'xercesImpl', version: '2.12.2' ],
6858
files("src/test/resources/data1.jar"),
@@ -83,7 +73,7 @@ tasks.withType(Test) {
8373
useJUnitPlatform() {
8474
}
8575
testLogging {
86-
events "passed"
76+
//events "passed"
8777
}
8878
}
8979

@@ -101,10 +91,6 @@ configurations.standaloneClasspath.each { it ->
10191
if (!it.name.startsWith("data") && !it.name.startsWith("xmlresolver")) {
10292
runtimeClasspath += " lib/" + it.name
10393
}
104-
// Explicitly remove the http libraries
105-
if (!it.toString().contains("http")) {
106-
EXCP += ":" + it
107-
}
10894
}
10995

11096
buildConfig {
@@ -187,19 +173,30 @@ task copyJars(type: Copy, dependsOn: ["jar", "dataJar"]) {
187173
}
188174
}
189175

190-
task copyDocs(type: Copy) {
191-
from "${projectDir}/docs"
192-
into "build/${basename}-${resolverVersion}/"
193-
filter { String line ->
194-
if (line.indexOf("@@") >= 0) {
195-
line = line
196-
.replace("@@VERSION@@", resolverVersion)
197-
}
198-
line
199-
}
176+
task copyDocs() {
200177
doFirst {
201178
mkdir "build/${basename}-${resolverVersion}"
202179
}
180+
doLast {
181+
copy {
182+
from "${projectDir}/docs"
183+
into "${buildDir}/${basename}-${resolverVersion}/"
184+
filter { String line ->
185+
if (line.indexOf("@@") >= 0) {
186+
line = line
187+
.replace("@@VERSION@@", resolverVersion)
188+
}
189+
line
190+
}
191+
}
192+
}
193+
doLast {
194+
copy {
195+
from projectDir
196+
into "${buildDir}/${basename}-${resolverVersion}/"
197+
include "LICENSE.md"
198+
}
199+
}
203200
}
204201

205202
task dist(dependsOn: ["copyDocs", "copyJars", "test"], type: Zip) {

docs/notices/APACHE-HTTPCLIENT.txt

-206
This file was deleted.

0 commit comments

Comments
 (0)