Skip to content

Commit 649fd40

Browse files
georgeajitgeorgeajit
authored andcommitted
Git #877 - Tests to use UTF-8 encoding.
1 parent a85bf98 commit 649fd40

File tree

2 files changed

+44
-45
lines changed

2 files changed

+44
-45
lines changed

build.gradle

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,44 @@
1-
subprojects {
2-
apply plugin: 'java'
3-
apply plugin: 'eclipse'
4-
apply plugin: 'jacoco'
5-
jacoco{toolVersion="0.7.4.201502262128"}
6-
7-
configure(allprojects){
8-
ext.slf4jVersion = '1.7.25'
9-
ext.logbackVersion = '1.2.3'
10-
}
11-
12-
sourceCompatibility = "1.8"
13-
targetCompatibility = "1.8"
14-
15-
sourceSets {
16-
test.compileClasspath += configurations.compileOnly
17-
test.runtimeClasspath += configurations.compileOnly
18-
}
19-
20-
repositories {
21-
mavenLocal()
22-
mavenCentral()
23-
jcenter()
24-
maven { url "http://repo.maven.apache.org/maven2" }
25-
}
26-
27-
dependencies {
28-
testCompile group: 'junit', name: 'junit', version:'4.12'
29-
testCompile group: 'xmlunit', name: 'xmlunit', version:'1.6'
30-
compileOnly group: 'org.apache.commons', name: 'commons-lang3', version:'3.7'
31-
compileOnly group: 'org.apache.httpcomponents', name: 'httpclient', version:'4.5.3'
32-
}
33-
34-
test {
35-
systemProperty "javax.xml.stream.XMLOutputFactory", "com.sun.xml.internal.stream.XMLOutputFactoryImpl"
36-
}
37-
}
38-
39-
task wrapper(type: Wrapper) {
40-
gradleVersion = '4.5.1'
41-
}
1+
subprojects {
2+
apply plugin: 'java'
3+
apply plugin: 'eclipse'
4+
apply plugin: 'jacoco'
5+
jacoco{toolVersion="0.7.4.201502262128"}
6+
7+
configure(allprojects){
8+
ext.slf4jVersion = '1.7.25'
9+
ext.logbackVersion = '1.2.3'
10+
}
11+
tasks.withType(JavaCompile) {
12+
options.encoding = 'UTF-8'
13+
}
14+
sourceCompatibility = "1.8"
15+
targetCompatibility = "1.8"
16+
17+
sourceSets {
18+
test.compileClasspath += configurations.compileOnly
19+
test.runtimeClasspath += configurations.compileOnly
20+
}
21+
22+
repositories {
23+
mavenLocal()
24+
mavenCentral()
25+
jcenter()
26+
maven { url "http://repo.maven.apache.org/maven2" }
27+
}
28+
29+
dependencies {
30+
testCompile group: 'junit', name: 'junit', version:'4.12'
31+
testCompile group: 'xmlunit', name: 'xmlunit', version:'1.6'
32+
compileOnly group: 'org.apache.commons', name: 'commons-lang3', version:'3.7'
33+
compileOnly group: 'org.apache.httpcomponents', name: 'httpclient', version:'4.5.3'
34+
}
35+
36+
test {
37+
systemProperty "file.encoding", "UTF-8"
38+
systemProperty "javax.xml.stream.XMLOutputFactory", "com.sun.xml.internal.stream.XMLOutputFactoryImpl"
39+
}
40+
}
41+
42+
task wrapper(type: Wrapper) {
43+
gradleVersion = '4.5.1'
44+
}

marklogic-client-api-functionaltests/build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ test {
33
events 'started','passed', 'skipped'
44
}
55

6-
tasks.withType(JavaCompile) {
7-
options.encoding = 'UTF-8'
8-
}
9-
106
exclude 'com/marklogic/client/functionaltest/TestSSLConnection.class'
117
exclude 'com/marklogic/client/functionaltest/TestBug18993.class'
128
exclude 'com/marklogic/client/functionaltest/TestDatabaseClientWithKerberos.class'

0 commit comments

Comments
 (0)