Skip to content

Commit 96dcaf7

Browse files
Merge pull request #164 from splunk/master
PR from Master to Develop
2 parents 49f27d0 + 87368b5 commit 96dcaf7

File tree

13 files changed

+109
-230
lines changed

13 files changed

+109
-230
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ on:
22
release:
33
types: [published]
44

5-
name: Create Release
5+
name: Release
66

77
jobs:
88
build:
9-
name: Create Release
9+
name: Java SDK Release
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v2

.travis.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,25 @@
1-
# Splunk SDK for Java Changelog
1+
# Splunk Enterprise SDK for Java Changelog
2+
3+
## Version 1.7.0
4+
5+
### New Features and APIs
6+
* Added Credits.md file along with licences. (Github PR [#162](https://github.com/splunk/splunk-sdk-java/pull/162)).
7+
* Improved TLS implementation as default behavior and turned on hostname verification for all hosts. (Github PR [#158](https://github.com/splunk/splunk-sdk-java/pull/158)).
8+
9+
### Minor changes
10+
* Replaced Travis CI with Github actions (Github PR [#161](https://github.com/splunk/splunk-sdk-java/pull/161)).
11+
* Fixed Javadoc generation while project packaging. (Github PR [#159](https://github.com/splunk/splunk-sdk-java/pull/159)).
12+
* Fixed breaking change of **Index.getMaxHotBuckets()** method behavior to return as String instead of int.
13+
* SDK build is migrated from ant build tool to maven build tool (Github PR [#157](https://github.com/splunk/splunk-sdk-java/pull/157)).
14+
* Dependencies directory for ant build is removed and maven dependencies are added using pom.xml.
15+
* Dependencies are upgraded to its LTS version.
16+
* Project structure is re-organized with respect to Maven.
17+
18+
## Version 1.6.5
19+
20+
### Bug Fixes
21+
22+
* Fixed bug for push back buffer is full when exporting data in XML (GitHub PR [#125](https://github.com/splunk/splunk-sdk-java/pull/125)).
223

324
## Version 1.6.4
425

@@ -124,7 +145,7 @@
124145

125146
### New features and APIs
126147

127-
* The Splunk SDK for Java is fully compatible with Splunk Enterprise 6.0 as of this release.
148+
* The Splunk Enterprise SDK for Java is fully compatible with Splunk Enterprise 6.0 as of this release.
128149

129150
### Bug fixes
130151

@@ -146,14 +167,14 @@
146167
OS X v10.9 Mavericks running Splunk 6.0.0. This issue is not present when running Splunk Enterprise on earlier
147168
versions of OS X. This will be fixed in a future release.
148169

149-
* The modular input support in the Splunk SDK for Java is not compatible with Windows Server 2003 or Windows Server
170+
* The modular input support in the Splunk Enterprise SDK for Java is not compatible with Windows Server 2003 or Windows Server
150171
2003 R2.
151172

152173
## Version 1.2
153174

154175
### New features and APIs
155176

156-
* Added support for building modular input scripts in Java using the Splunk SDK for Java.
177+
* Added support for building modular input scripts in Java using the Splunk Enterprise SDK for Java.
157178

158179
### Bug fixes
159180

@@ -473,7 +494,7 @@ changes are not included):
473494
* Added a namespacing feature as optional arguments (`app`, `owner`, `sharing`)
474495
to the collection's `create` and `get` methods. For more information about
475496
namespaces, see
476-
["Overview of the Splunk SDK for Java"](http://dev.splunk.com/view/java-sdk/SP-CAAAECN)
497+
["Overview of the Splunk Enterprise SDK for Java"](http://dev.splunk.com/view/java-sdk/SP-CAAAECN)
477498
on the Developer Portal.
478499

479500
The following example shows how to use the optional namespace to restrict
@@ -579,4 +600,4 @@ changes are not included):
579600

580601
## Version 0.1.0 (preview)
581602

582-
Initial Splunk SDK for Java release.
603+
Initial Splunk Enterprise SDK for Java release.

CONTRIBUTING.md

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,34 @@
22

33
## How to contribute
44

5-
If you would like to contribute to this project, go here for more information:
5+
If you would like to contribute to this project, see [Contributions to Splunk](https://www.splunk.com/en_us/form/contributions.html) for more information.
66

7-
* [Splunk and open source][contributions]
8-
* [Individual contributions][indivcontrib]
9-
* [Company contributions][companycontrib]
7+
## Issues and bug reports
108

11-
## Issues & Bug Reports
9+
If you're seeing some unexpected behavior with this project, please create an [issue](https://github.com/splunk/splunk-sdk-java/issues) on GitHub with the following information:
1210

13-
If you're seeing some unexpected behavior with this project, please create an [issue on GitHub][issues] with the following information:
11+
1. Version of this project you're using (ex: 1.4.0)
12+
2. Platform version (ex: Windows Server 2012)
13+
3. Framework version (ex: Java 8)
14+
4. Splunk Enterprise version (ex: 8.0)
15+
5. Other relevant information (ex: local/remote environment, Splunk network configuration, standalone or distributed deployment, are load balancers used)
1416

15-
0. Version of this project you're using (ex: 1.4.0)
16-
0. Platform version (ex: Windows Server 2012)
17-
0. Framework version (ex: Java 8)
18-
0. Splunk version (ex: 6.2.2)
19-
0. Other relevant information (ex: local/remote environment, Splunk network configuration)
20-
21-
Alternatively, if you have a Splunk question please ask on [Splunk Answers][answers]
17+
Alternatively, if you have a Splunk question please ask on [Splunk Answers](https://community.splunk.com/t5/Splunk-Development/ct-p/developer-tools).
2218

2319
## Pull requests
2420

2521
We love to see pull requests!
2622

2723
To create a pull request:
2824

29-
0. Fill out the [Individual Contributor Agreement][indivcontrib].
30-
0. Fork [the repository][repo].
31-
0. Make changes to the **`develop`** branch, preferably with tests.
32-
0. Create a [pull request][pulls] against the **`develop`** branch.
25+
1. Fill out the [Individual Contributor Agreement](https://www.splunk.com/en_us/form/contributions.html).
26+
2. Fork the [repository](https://github.com/splunk/splunk-sdk-java).
27+
3. Make changes to the **develop** branch, preferably with tests.
28+
4. Create a [pull request](https://github.com/splunk/splunk-sdk-java/pulls) against the **develop** branch.
3329

3430
## Contact us
3531

36-
You can reach Splunk support at _[email protected]_ if you have Splunk related questions.
32+
If you have a paid Splunk Enterprise or Splunk Cloud license, you can contact [Support](https://www.splunk.com/en_us/support-and-services.html) with questions.
3733

38-
You can reach the Developer Platform team at _[email protected]_.
34+
You can reach the Splunk Developer Platform team at _[email protected]_.
3935

40-
[contributions]: http://dev.splunk.com/view/opensource/SP-CAAAEDM
41-
[indivcontrib]: http://dev.splunk.com/goto/individualcontributions
42-
[companycontrib]: http://dev.splunk.com/view/companycontributions/SP-CAAAEDR
43-
[answers]: http://answers.splunk.com/
44-
[repo]: https://github.com/splunk/splunk-sdk-java
45-
[issues]: https://github.com/splunk/splunk-sdk-java/issues
46-
[pulls]: https://github.com/splunk/splunk-sdk-java/pulls

0 commit comments

Comments
 (0)