Skip to content

Commit 8150511

Browse files
Merge branch 'release/1.7.0' of https://github.com/splunk/splunk-sdk-java into release/1.7.0
2 parents 19245b8 + a7a3f5a commit 8150511

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,19 @@
1212
* Added Credits.md file along with licences. (Github PR [#162](https://github.com/splunk/splunk-sdk-java/pull/162)).
1313
* Improved SSL/TLS implementation and hostname verification. (Github PR [#158](https://github.com/splunk/splunk-sdk-java/pull/158)).
1414

15+
### Minor changes
16+
* Replaced Travis CI with Github actions (Github PR [#161](https://github.com/splunk/splunk-sdk-java/pull/161)).
17+
* Fixed Javadoc generation while packaging. (Github PR [#159](https://github.com/splunk/splunk-sdk-java/pull/159)).
18+
* SDK build is migrated from ant build tool to maven build tool (Github PR [#157](https://github.com/splunk/splunk-sdk-java/pull/157)).
19+
* Dependencies directory for ant build is removed and maven dependencies are added using pom.xml.
20+
* Dependencies are upgraded to its LTS version.
21+
22+
## Version 1.7.0
23+
24+
### New Features and APIs
25+
* Added Credits.md file along with licences. (Github PR [#162](https://github.com/splunk/splunk-sdk-java/pull/162)).
26+
* Improved SSL/TLS implementation and hostname verification. (Github PR [#158](https://github.com/splunk/splunk-sdk-java/pull/158)).
27+
1528
### Minor changes
1629
* Replaced Travis CI with Github actions (Github PR [#161](https://github.com/splunk/splunk-sdk-java/pull/161)).
1730
* Fixed Javadoc generation while packaging. (Github PR [#159](https://github.com/splunk/splunk-sdk-java/pull/159)).

splunk/src/main/java/com/splunk/HttpService.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public class HttpService {
3838
private static final boolean VERBOSE_REQUESTS = false;
3939
public static boolean useTLS=false;
4040
protected static SSLSecurityProtocol sslSecurityProtocol = null;
41-
4241
private static SSLSocketFactory sslSocketFactory = createSSLFactory();
4342
private static String HTTPS_SCHEME = "https";
4443
private static String HTTP_SCHEME = "http";

0 commit comments

Comments
 (0)