Skip to content

Commit 44a739d

Browse files
author
Mark
committed
fix test jvm compatibility
1 parent abd4179 commit 44a739d

File tree

2 files changed

+20
-16
lines changed

2 files changed

+20
-16
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@
254254
<dependency>
255255
<groupId>org.json</groupId>
256256
<artifactId>json</artifactId>
257-
<version>20151123</version>
257+
<version>20140107</version>
258258
<scope>test</scope>
259259
</dependency>
260260

src/test/java/com/arangodb/example/ssl/SslExample.java

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import com.arangodb.ArangoHost;
3838
import com.arangodb.entity.ArangoVersion;
3939
import com.arangodb.http.HttpResponseEntity;
40+
import com.arangodb.util.TestUtils;
4041

4142
/*-
4243
* Example for using a HTTPS connection
@@ -95,21 +96,24 @@ public void httpTest() throws ArangoException {
9596

9697
@Test
9798
public void sslConnectionTest() throws ArangoException {
98-
// use HTTPS with java default trust store
99-
ArangoConfigure configuration = null;
100-
try {
101-
configuration = new ArangoConfigure();
102-
configuration.setArangoHost(new ArangoHost("www.arangodb.com", 443));
103-
configuration.setUseSsl(true);
104-
configuration.init();
105-
106-
final ArangoDriver arangoDriver = new ArangoDriver(configuration);
107-
108-
final HttpResponseEntity response = arangoDriver.getHttpManager().doGet("/");
109-
Assert.assertEquals(200, response.getStatusCode());
110-
} finally {
111-
if (configuration != null) {
112-
configuration.shutdown();
99+
final String javaVersion = System.getProperty("java.version");
100+
if (TestUtils.compareVersion(javaVersion, "1.7") > -1) {
101+
// use HTTPS with java default trust store
102+
ArangoConfigure configuration = null;
103+
try {
104+
configuration = new ArangoConfigure();
105+
configuration.setArangoHost(new ArangoHost("www.arangodb.com", 443));
106+
configuration.setUseSsl(true);
107+
configuration.init();
108+
109+
final ArangoDriver arangoDriver = new ArangoDriver(configuration);
110+
111+
final HttpResponseEntity response = arangoDriver.getHttpManager().doGet("/");
112+
Assert.assertEquals(200, response.getStatusCode());
113+
} finally {
114+
if (configuration != null) {
115+
configuration.shutdown();
116+
}
113117
}
114118
}
115119
}

0 commit comments

Comments
 (0)