Skip to content

Commit 9ddafeb

Browse files
committed
Don't require both trust and key store configuration when running tests
1 parent 1c7dcfb commit 9ddafeb

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

build.gradle

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -139,14 +139,20 @@ configure(javaCodeCheckedProjects) {
139139
}
140140

141141
if (project.buildingWith('ssl.enabled')) {
142-
systemProperties(
143-
'javax.net.ssl.keyStoreType': project.property('ssl.keyStoreType'),
144-
'javax.net.ssl.keyStore': project.property('ssl.keyStore'),
145-
'javax.net.ssl.keyStorePassword': project.property('ssl.keyStorePassword'),
146-
'javax.net.ssl.trustStoreType': project.property('ssl.trustStoreType'),
147-
'javax.net.ssl.trustStore': project.property('ssl.trustStore'),
148-
'javax.net.ssl.trustStorePassword': project.property('ssl.trustStorePassword')
149-
)
142+
if (project.hasProperty('ssl.keyStoreType')) {
143+
systemProperties(
144+
'javax.net.ssl.keyStoreType': project.property('ssl.keyStoreType'),
145+
'javax.net.ssl.keyStore': project.property('ssl.keyStore'),
146+
'javax.net.ssl.keyStorePassword': project.property('ssl.keyStorePassword'),
147+
)
148+
}
149+
if (project.hasProperty('ssl.trustStoreType')) {
150+
systemProperties(
151+
'javax.net.ssl.trustStoreType': project.property('ssl.trustStoreType'),
152+
'javax.net.ssl.trustStore': project.property('ssl.trustStore'),
153+
'javax.net.ssl.trustStorePassword': project.property('ssl.trustStorePassword')
154+
)
155+
}
150156
}
151157

152158
if (project.buildingWith('gssapi.enabled')) {

0 commit comments

Comments
 (0)