Skip to content

Commit 87368b5

Browse files
Merge pull request #163 from splunk/release/1.7.0
Release/1.7.0
2 parents ffe45f8 + ad95755 commit 87368b5

File tree

429 files changed

+4332
-949
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

429 files changed

+4332
-949
lines changed

.github/workflows/release.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
on:
2+
release:
3+
types: [published]
4+
5+
name: Release
6+
7+
jobs:
8+
build:
9+
name: Java SDK Release
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
- name: Set up JDK 1.8
14+
uses: actions/setup-java@v1
15+
with:
16+
java-version: 1.8
17+
server-username: MAVEN_USERNAME
18+
server-password: MAVEN_PASSWORD
19+
server-id: splunk-artifactory
20+
- name: build
21+
run: mvn package --file pom.xml -DskipTests=true
22+
- name: Create GitHub Release
23+
uses: softprops/action-gh-release@v1
24+
with:
25+
# body_path: ${{ github.workflow }}-CHANGELOG.txt
26+
files: ./target/*.jar
27+
draft: true
28+
env:
29+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
30+
- name: Deploy to Artifactory
31+
run: mvn --batch-mode deploy -DskipTests=true
32+
env:
33+
MAVEN_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
34+
MAVEN_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}

.github/workflows/test.yml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
name: Java SDK Test
2+
3+
on:
4+
[push, pull_request]
5+
6+
jobs:
7+
test:
8+
strategy:
9+
fail-fast: false
10+
matrix:
11+
os:
12+
- ubuntu-latest
13+
java-version:
14+
- 1.8
15+
splunk-version:
16+
- "8.0"
17+
- "8.2.0"
18+
runs-on: ${{ matrix.os }}
19+
20+
services:
21+
splunk:
22+
image: splunk/splunk:${{matrix.splunk-version}}
23+
env:
24+
SPLUNK_START_ARGS: --accept-license
25+
SPLUNK_PASSWORD: changed!
26+
TEST_TCP_PORT: 10667
27+
TEST_UDP_PORT: 10668
28+
SPLUNK_HOME: "/opt/splunk"
29+
ports:
30+
- 8000:8000
31+
- 8089:8089
32+
- 8088:8088
33+
- 10667:10667
34+
- 10668:10668/udp
35+
36+
steps:
37+
- uses: actions/checkout@v2
38+
- name: Set up JDK
39+
uses: actions/setup-java@v1
40+
with:
41+
java-version: 1.8
42+
43+
- name: Cache local Maven repository
44+
uses: actions/cache@v2
45+
with:
46+
path: ~/.m2/repository
47+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
48+
restore-keys: ${{ runner.os }}-maven-
49+
50+
- name: Create .splunkrc file
51+
run: |
52+
cd ~
53+
echo host=localhost >> .splunkrc
54+
echo port=8089 >> .splunkrc
55+
echo username=admin >> .splunkrc
56+
echo password=changed! >> .splunkrc
57+
echo scheme=https >> .splunkrc
58+
echo version=${{ matrix.splunk }} >> .splunkrc
59+
60+
- name: Test using maven
61+
run: make test
62+
env:
63+
SPLUNK_HOME: "/opt/splunk"
64+
TEST_TCP_PORT: 10667
65+
TEST_UDP_PORT: 10668

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@
88
build
99
dist
1010
out
11+
target/
1112

1213
# Test & Coverage
1314
TEST-com.splunk.*.xml
1415

1516
# IntelliJ
1617
.idea/workspace.xml
1718
.idea/misc.xml
19+
.idea/
1820

1921
# Unknown
2022
*.swp

.idea/ant.xml

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

.travis.yml

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

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# Splunk Enterprise SDK for Java Changelog
22

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+
318
## Version 1.6.5
419

520
### Bug Fixes

CREDITS.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Third-party software credits
2+
3+
Some of the components included in the Splunk Enterprise SDK for Java are licensed under free or open source licenses. We wish to thank the contributors to those projects.
4+
5+
| Contributor | Description | License |
6+
|:----------- |:----------- |:------- |
7+
| [opencsv](https://sourceforge.net/p/opencsv/source/ci/master/tree/) | For reading and writing CSV in Java | [Apache](https://github.com/splunk/splunk-sdk-java/blob/master/licenses/LICENSE-OPENCSV) |
8+
| [commons-cli](https://github.com/apache/commons-cli) | A package of Java utility classes for the classes that are in java.lang's hierarchy | [Apache](https://github.com/splunk/splunk-sdk-java/blob/master/licenses/LICENSE-COMMONS) |
9+
| [gson](https://github.com/google/gson) | Convert Java Objects into their JSON representation | [Apache](https://github.com/splunk/splunk-sdk-java/blob/master/licenses/LICENSE-GSON) |
10+
| [junit](https://github.com/junit-team/junit4) | Unit testing framework for Java | [Eclipse](https://github.com/splunk/splunk-sdk-java/blob/master/licenses/LICENSE-JUNIT) |
11+
| [jacoco](https://github.com/jacoco/jacoco) | JaCoCo runtime agent to your tests and allows basic report creation. | [Eclipse](https://github.com/splunk/splunk-sdk-java/blob/master/licenses/LICENSE-JACOCO) |
12+
| [netbeans-api](https://github.com/apache/netbeans) | OpenIDE Utilities | [Apache](https://github.com/splunk/splunk-sdk-java/blob/master/licenses/LICENSE-NETBEANS) |

Makefile

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# text reset
2+
NO_COLOR=\033[0m
3+
# green
4+
OK_COLOR=\033[32;01m
5+
# red
6+
ERROR_COLOR=\033[31;01m
7+
# cyan
8+
WARN_COLOR=\033[36;01m
9+
# yellow
10+
ATTN_COLOR=\033[33;01m
11+
12+
ROOT_DIR := $(shell git rev-parse --show-toplevel)
13+
14+
VERSION := `git describe --tags --dirty 2>/dev/null`
15+
COMMITHASH := `git rev-parse --short HEAD 2>/dev/null`
16+
DATE := `date "+%FT%T%z"`
17+
18+
.PHONY: all
19+
all: init test
20+
21+
init:
22+
@echo "$(ATTN_COLOR)==> init $(NO_COLOR)"
23+
24+
.PHONY: test
25+
test:
26+
@echo "$(ATTN_COLOR)==> test $(NO_COLOR)"
27+
# @ant test
28+
@mvn test
29+
30+
.PHONY: test_specific
31+
test_specific:
32+
@echo "$(ATTN_COLOR)==> test_specific $(NO_COLOR)"
33+
@sh ./scripts/test_specific.sh
34+
35+
.PHONY: up
36+
up:
37+
@echo "$(ATTN_COLOR)==> up $(NO_COLOR)"
38+
@docker-compose up -d
39+
40+
.PHONY: wait_up
41+
wait_up:
42+
@echo "$(ATTN_COLOR)==> wait_up $(NO_COLOR)"
43+
@for i in `seq 0 180`; do if docker exec -it splunk /sbin/checkstate.sh &> /dev/null; then break; fi; printf "\rWaiting for Splunk for %s seconds..." $$i; sleep 1; done
44+
45+
.PHONY: down
46+
down:
47+
@echo "$(ATTN_COLOR)==> down $(NO_COLOR)"
48+
@docker-compose stop

0 commit comments

Comments
 (0)