Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
115 commits
Select commit Hold shift + click to select a range
b10f671
Run CI against Splunk 7.2
Oct 30, 2018
02274ba
fix invalid crontab in test
Oct 30, 2018
835ad6d
fix javadoc error
Oct 31, 2018
716b717
Merge remote-tracking branch 'origin/develop' into ci/splunk-7.2
Dec 5, 2018
175ccfe
Fix datamodel test causing crash
Dec 5, 2018
6916b4e
add sleep to uploadtest so splunkd.log will exist in CI
Dec 6, 2018
3d6d7d5
Increase UploadTest timeout to 8s
Dec 6, 2018
829fbbf
Merge pull request #128 from splunk/ci/splunk-7.2
shakeelmohamed Dec 6, 2018
85b9fd6
Revise README
PKing70 Apr 11, 2019
bc056ab
Merge pull request #134 from PKing70/patch-2
May 8, 2019
6f543e5
fix uploadtest
May 13, 2019
e4a7c31
Ensure index tests restart before exiting
May 13, 2019
5c82c56
index tests should restart regardlesss of requirement to
May 13, 2019
48cf1a8
use better format for temp files in UploadTest
May 13, 2019
46c0f15
restart when needed for delete index tests
May 13, 2019
28c45b0
Update upload test
May 14, 2019
5cdeb1e
Update CI configuration & README for new test environment
May 14, 2019
cbe2397
Update Java version parsing method
May 14, 2019
ca52da3
update CI password
May 14, 2019
a2479ce
fix version typo in readme
May 15, 2019
d1827fc
Merge pull request #136 from splunk/ci/java-versions
dan1 May 15, 2019
5a1139c
Install sdk-app-collection via docker-compose; add standard SDK makef…
amysutedja May 26, 2020
4163332
Merge pull request #146 from splunk/docker-splunk
amysutedja May 29, 2020
4dc6ee9
Project strcuture refactored as below:
bparmar-splunk Jun 9, 2021
00da971
Test specific file is changed to be compatible with maven.
bparmar-splunk Jun 9, 2021
8327c43
Local deployment change implemented.
bparmar-splunk Jun 10, 2021
46d986a
Maven deployed plugin is moved to Parent pom instead of splunk sub-mo…
bparmar-splunk Jun 10, 2021
f992f83
Changes reverted to old implementation.
bparmar-splunk Jun 11, 2021
3edaad4
Changes as per David's comments are added.
bparmar-splunk Jun 14, 2021
ab1ed1d
Updated HttpService
ashah-splunk Jun 14, 2021
700ed3b
Update HttpService.java
ashah-splunk Jun 14, 2021
123693b
Merge pull request #157 from splunk/DVPL-9534
ashah-splunk Jun 16, 2021
d9f9681
Disable deprecated endpoint test cases
akaila-splunk Jun 21, 2021
0c1882b
Clean-up Javadoc generation
bparmar-splunk Jun 23, 2021
f7442a1
Ignored test cases due to change in REST API endpoint apps/appinstall
akaila-splunk Jun 24, 2021
442e924
Changed filename for Linux os
akaila-splunk Jun 25, 2021
6f43673
Ant build.xml file deleted.
bparmar-splunk Jun 28, 2021
561f057
Github Actions - Test file added
bparmar-splunk Jun 29, 2021
e008968
Test YAML modified
bparmar-splunk Jun 29, 2021
f9eb612
Location of docker-compose file changed.
bparmar-splunk Jun 29, 2021
4ab9e48
Docker compose command omitted.
bparmar-splunk Jun 29, 2021
33f4d2e
SplunkRC file added
bparmar-splunk Jun 29, 2021
30f6a51
Environment variable (TCP & UDP Port) for Test command added.
bparmar-splunk Jun 29, 2021
f39112e
Github actions test.yml with splunk docker version 8.0
bparmar-splunk Jun 30, 2021
eb32c57
Testing test.yml with splunk docker instance v8.0 and latest.
bparmar-splunk Jun 30, 2021
ff91c5f
Checking test.yml with splunk docker instance latest only
bparmar-splunk Jun 30, 2021
f4c99f8
Merge pull request #159 from splunk/DVPL-9622
ashah-splunk Jul 1, 2021
7b3774a
Merge remote-tracking branch 'origin/develop' into DVPL-9265
ashah-splunk Jul 1, 2021
64a9cf8
Github Actions Test and release actions updated
bparmar-splunk Jul 1, 2021
a91d966
Update HttpService.java
ashah-splunk Jul 1, 2021
b19ad5c
Github actions release file updated with prerelease type
bparmar-splunk Jul 2, 2021
caf3ce5
POM modified for Github release action.
bparmar-splunk Jul 2, 2021
61cefb1
Skipping test in Github release actions.
bparmar-splunk Jul 2, 2021
1880f9f
Examples pom modified.
bparmar-splunk Jul 2, 2021
dc2355c
Tests are skipped and distribution management added.
bparmar-splunk Jul 2, 2021
105aaea
BETA Release is reverted back to v1.6.5
bparmar-splunk Jul 2, 2021
0f8727e
Merge pull request #158 from splunk/DVPL-9265
ashah-splunk Jul 5, 2021
7c33e51
Merge pull request #161 from splunk/DVPL-9687
bparmar-splunk Jul 12, 2021
2687370
CREDITS.md file has been added along with their respective licenses.
rmaheshwari-splunk Jul 21, 2021
49f27d0
Merge pull request #162 from splunk/DVPL-9728
ashah-splunk Jul 22, 2021
7c91e86
Release Notes
bparmar-splunk Jul 26, 2021
d5c492e
Release Notes
bparmar-splunk Jul 26, 2021
2ffbd5f
ChangeLog file modified.
bparmar-splunk Jul 27, 2021
a7a3f5a
Merge branch 'release/1.7.0' of https://github.com/splunk/splunk-sdk-…
bparmar-splunk Jul 27, 2021
63e65d6
Run CI against Splunk 7.2
Oct 30, 2018
13df2e2
fix invalid crontab in test
Oct 30, 2018
c851feb
fix javadoc error
Oct 31, 2018
3b65a3c
Fix datamodel test causing crash
Dec 5, 2018
6b53fb3
add sleep to uploadtest so splunkd.log will exist in CI
Dec 6, 2018
24c759f
Increase UploadTest timeout to 8s
Dec 6, 2018
1c50b56
Revise README
PKing70 Apr 11, 2019
c1cb68b
fix uploadtest
May 13, 2019
ce2cac6
Ensure index tests restart before exiting
May 13, 2019
943a8a2
index tests should restart regardlesss of requirement to
May 13, 2019
e138922
use better format for temp files in UploadTest
May 13, 2019
376156b
restart when needed for delete index tests
May 13, 2019
ec9049c
Update upload test
May 14, 2019
e9a7686
Conflicts mergedUpdate CI configuration & README for new test environ…
May 14, 2019
59915bf
Update Java version parsing method
May 14, 2019
d35b2ee
Conflicts mergedInstall sdk-app-collection via docker-compose; add st…
amysutedja May 26, 2020
1bcb4c0
Updated HttpService
ashah-splunk Jun 14, 2021
fd65704
Update HttpService.java
ashah-splunk Jun 14, 2021
5c3318f
Project strcuture refactored as below:
bparmar-splunk Jun 9, 2021
ca4753a
Test specific file is changed to be compatible with maven.
bparmar-splunk Jun 9, 2021
00bd0b8
Local deployment change implemented.
bparmar-splunk Jun 10, 2021
fae17d0
Maven deployed plugin is moved to Parent pom instead of splunk sub-mo…
bparmar-splunk Jun 10, 2021
107c42e
Changes as per David's comments are added.
bparmar-splunk Jun 14, 2021
6cd4b7a
Disable deprecated endpoint test cases
akaila-splunk Jun 21, 2021
296acbc
Clean-up Javadoc generation
bparmar-splunk Jun 23, 2021
df9a72f
Ignored test cases due to change in REST API endpoint apps/appinstall
akaila-splunk Jun 24, 2021
434e6cf
Changed filename for Linux os
akaila-splunk Jun 25, 2021
ae9a11c
Update HttpService.java
ashah-splunk Jul 1, 2021
0011dd0
Github Actions - Test file added
bparmar-splunk Jun 29, 2021
335c368
Test YAML modified
bparmar-splunk Jun 29, 2021
5bdedd6
Location of docker-compose file changed.
bparmar-splunk Jun 29, 2021
6da9dc6
Docker compose command omitted.
bparmar-splunk Jun 29, 2021
a19a215
SplunkRC file added
bparmar-splunk Jun 29, 2021
c5a6146
Environment variable (TCP & UDP Port) for Test command added.
bparmar-splunk Jun 29, 2021
124635d
Github actions test.yml with splunk docker version 8.0
bparmar-splunk Jun 30, 2021
dfc44df
Testing test.yml with splunk docker instance v8.0 and latest.
bparmar-splunk Jun 30, 2021
4a64915
Checking test.yml with splunk docker instance latest only
bparmar-splunk Jun 30, 2021
c873b62
Github Actions Test and release actions updated
bparmar-splunk Jul 1, 2021
03bad07
Github actions release file updated with prerelease type
bparmar-splunk Jul 2, 2021
83f51ff
POM modified for Github release action.
bparmar-splunk Jul 2, 2021
efdbdca
Skipping test in Github release actions.
bparmar-splunk Jul 2, 2021
2361374
Examples pom modified.
bparmar-splunk Jul 2, 2021
3210a22
Tests are skipped and distribution management added.
bparmar-splunk Jul 2, 2021
dde418a
BETA Release is reverted back to v1.6.5
bparmar-splunk Jul 2, 2021
94121a0
CREDITS.md file has been added along with their respective licenses.
rmaheshwari-splunk Jul 21, 2021
2a27e05
Release Notes
bparmar-splunk Jul 26, 2021
19245b8
ChangeLog file modified.
bparmar-splunk Jul 27, 2021
8150511
Merge branch 'release/1.7.0' of https://github.com/splunk/splunk-sdk-…
bparmar-splunk Jul 27, 2021
3a54e7b
ChangeLog modified
bparmar-splunk Jul 27, 2021
5d4ec68
POM files refactored.
bparmar-splunk Jul 27, 2021
ad95755
ChangeLog.md modified with all changes
bparmar-splunk Jul 29, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
34 changes: 34 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
on:
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Let's capture this in the RELEASE_NOTES.md as "Move CI from Travis to Github Actions and add CD"

release:
types: [published]

name: Release

jobs:
build:
name: Java SDK Release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
server-id: splunk-artifactory
- name: build
run: mvn package --file pom.xml -DskipTests=true
- name: Create GitHub Release
uses: softprops/action-gh-release@v1
with:
# body_path: ${{ github.workflow }}-CHANGELOG.txt
files: ./target/*.jar
draft: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Deploy to Artifactory
run: mvn --batch-mode deploy -DskipTests=true
env:
MAVEN_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
65 changes: 65 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
name: Java SDK Test

on:
[push, pull_request]

jobs:
test:
strategy:
fail-fast: false
matrix:
os:
- ubuntu-latest
java-version:
- 1.8
splunk-version:
- "8.0"
- "8.2.0"
runs-on: ${{ matrix.os }}

services:
splunk:
image: splunk/splunk:${{matrix.splunk-version}}
env:
SPLUNK_START_ARGS: --accept-license
SPLUNK_PASSWORD: changed!
TEST_TCP_PORT: 10667
TEST_UDP_PORT: 10668
SPLUNK_HOME: "/opt/splunk"
ports:
- 8000:8000
- 8089:8089
- 8088:8088
- 10667:10667
- 10668:10668/udp

steps:
- uses: actions/checkout@v2
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 1.8

- name: Cache local Maven repository
uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-maven-

- name: Create .splunkrc file
run: |
cd ~
echo host=localhost >> .splunkrc
echo port=8089 >> .splunkrc
echo username=admin >> .splunkrc
echo password=changed! >> .splunkrc
echo scheme=https >> .splunkrc
echo version=${{ matrix.splunk }} >> .splunkrc

- name: Test using maven
run: make test
env:
SPLUNK_HOME: "/opt/splunk"
TEST_TCP_PORT: 10667
TEST_UDP_PORT: 10668
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@
build
dist
out
target/

# Test & Coverage
TEST-com.splunk.*.xml

# IntelliJ
.idea/workspace.xml
.idea/misc.xml
.idea/

# Unknown
*.swp
Expand Down
7 changes: 0 additions & 7 deletions .idea/ant.xml

This file was deleted.

48 changes: 0 additions & 48 deletions .travis.yml

This file was deleted.

15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# Splunk Enterprise SDK for Java Changelog

## Version 1.7.0

### New Features and APIs
* Added Credits.md file along with licences. (Github PR [#162](https://github.com/splunk/splunk-sdk-java/pull/162)).
* 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)).

### Minor changes
* Replaced Travis CI with Github actions (Github PR [#161](https://github.com/splunk/splunk-sdk-java/pull/161)).
* Fixed Javadoc generation while project packaging. (Github PR [#159](https://github.com/splunk/splunk-sdk-java/pull/159)).
* Fixed breaking change of **Index.getMaxHotBuckets()** method behavior to return as String instead of int.
* SDK build is migrated from ant build tool to maven build tool (Github PR [#157](https://github.com/splunk/splunk-sdk-java/pull/157)).
* Dependencies directory for ant build is removed and maven dependencies are added using pom.xml.
* Dependencies are upgraded to its LTS version.
* Project structure is re-organized with respect to Maven.

## Version 1.6.5

### Bug Fixes
Expand Down
12 changes: 12 additions & 0 deletions CREDITS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Third-party software credits

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.

| Contributor | Description | License |
|:----------- |:----------- |:------- |
| [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) |
| [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) |
| [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) |
| [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) |
| [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) |
| [netbeans-api](https://github.com/apache/netbeans) | OpenIDE Utilities | [Apache](https://github.com/splunk/splunk-sdk-java/blob/master/licenses/LICENSE-NETBEANS) |
48 changes: 48 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# text reset
NO_COLOR=\033[0m
# green
OK_COLOR=\033[32;01m
# red
ERROR_COLOR=\033[31;01m
# cyan
WARN_COLOR=\033[36;01m
# yellow
ATTN_COLOR=\033[33;01m

ROOT_DIR := $(shell git rev-parse --show-toplevel)

VERSION := `git describe --tags --dirty 2>/dev/null`
COMMITHASH := `git rev-parse --short HEAD 2>/dev/null`
DATE := `date "+%FT%T%z"`

.PHONY: all
all: init test

init:
@echo "$(ATTN_COLOR)==> init $(NO_COLOR)"

.PHONY: test
test:
@echo "$(ATTN_COLOR)==> test $(NO_COLOR)"
# @ant test
@mvn test

.PHONY: test_specific
test_specific:
@echo "$(ATTN_COLOR)==> test_specific $(NO_COLOR)"
@sh ./scripts/test_specific.sh

.PHONY: up
up:
@echo "$(ATTN_COLOR)==> up $(NO_COLOR)"
@docker-compose up -d

.PHONY: wait_up
wait_up:
@echo "$(ATTN_COLOR)==> wait_up $(NO_COLOR)"
@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

.PHONY: down
down:
@echo "$(ATTN_COLOR)==> down $(NO_COLOR)"
@docker-compose stop
Loading