-
Notifications
You must be signed in to change notification settings - Fork 121
Release/1.7.0 #163
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Release/1.7.0 #163
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
02274ba
fix invalid crontab in test
835ad6d
fix javadoc error
716b717
Merge remote-tracking branch 'origin/develop' into ci/splunk-7.2
175ccfe
Fix datamodel test causing crash
6916b4e
add sleep to uploadtest so splunkd.log will exist in CI
3d6d7d5
Increase UploadTest timeout to 8s
829fbbf
Merge pull request #128 from splunk/ci/splunk-7.2
shakeelmohamed 85b9fd6
Revise README
PKing70 bc056ab
Merge pull request #134 from PKing70/patch-2
6f543e5
fix uploadtest
e4a7c31
Ensure index tests restart before exiting
5c82c56
index tests should restart regardlesss of requirement to
48cf1a8
use better format for temp files in UploadTest
46c0f15
restart when needed for delete index tests
28c45b0
Update upload test
5cdeb1e
Update CI configuration & README for new test environment
cbe2397
Update Java version parsing method
ca52da3
update CI password
a2479ce
fix version typo in readme
d1827fc
Merge pull request #136 from splunk/ci/java-versions
dan1 5a1139c
Install sdk-app-collection via docker-compose; add standard SDK makef…
amysutedja 4163332
Merge pull request #146 from splunk/docker-splunk
amysutedja 4dc6ee9
Project strcuture refactored as below:
bparmar-splunk 00da971
Test specific file is changed to be compatible with maven.
bparmar-splunk 8327c43
Local deployment change implemented.
bparmar-splunk 46d986a
Maven deployed plugin is moved to Parent pom instead of splunk sub-mo…
bparmar-splunk f992f83
Changes reverted to old implementation.
bparmar-splunk 3edaad4
Changes as per David's comments are added.
bparmar-splunk ab1ed1d
Updated HttpService
ashah-splunk 700ed3b
Update HttpService.java
ashah-splunk 123693b
Merge pull request #157 from splunk/DVPL-9534
ashah-splunk d9f9681
Disable deprecated endpoint test cases
akaila-splunk 0c1882b
Clean-up Javadoc generation
bparmar-splunk f7442a1
Ignored test cases due to change in REST API endpoint apps/appinstall
akaila-splunk 442e924
Changed filename for Linux os
akaila-splunk 6f43673
Ant build.xml file deleted.
bparmar-splunk 561f057
Github Actions - Test file added
bparmar-splunk e008968
Test YAML modified
bparmar-splunk f9eb612
Location of docker-compose file changed.
bparmar-splunk 4ab9e48
Docker compose command omitted.
bparmar-splunk 33f4d2e
SplunkRC file added
bparmar-splunk 30f6a51
Environment variable (TCP & UDP Port) for Test command added.
bparmar-splunk f39112e
Github actions test.yml with splunk docker version 8.0
bparmar-splunk eb32c57
Testing test.yml with splunk docker instance v8.0 and latest.
bparmar-splunk ff91c5f
Checking test.yml with splunk docker instance latest only
bparmar-splunk f4c99f8
Merge pull request #159 from splunk/DVPL-9622
ashah-splunk 7b3774a
Merge remote-tracking branch 'origin/develop' into DVPL-9265
ashah-splunk 64a9cf8
Github Actions Test and release actions updated
bparmar-splunk a91d966
Update HttpService.java
ashah-splunk b19ad5c
Github actions release file updated with prerelease type
bparmar-splunk caf3ce5
POM modified for Github release action.
bparmar-splunk 61cefb1
Skipping test in Github release actions.
bparmar-splunk 1880f9f
Examples pom modified.
bparmar-splunk dc2355c
Tests are skipped and distribution management added.
bparmar-splunk 105aaea
BETA Release is reverted back to v1.6.5
bparmar-splunk 0f8727e
Merge pull request #158 from splunk/DVPL-9265
ashah-splunk 7c33e51
Merge pull request #161 from splunk/DVPL-9687
bparmar-splunk 2687370
CREDITS.md file has been added along with their respective licenses.
rmaheshwari-splunk 49f27d0
Merge pull request #162 from splunk/DVPL-9728
ashah-splunk 7c91e86
Release Notes
bparmar-splunk d5c492e
Release Notes
bparmar-splunk 2ffbd5f
ChangeLog file modified.
bparmar-splunk a7a3f5a
Merge branch 'release/1.7.0' of https://github.com/splunk/splunk-sdk-…
bparmar-splunk 63e65d6
Run CI against Splunk 7.2
13df2e2
fix invalid crontab in test
c851feb
fix javadoc error
3b65a3c
Fix datamodel test causing crash
6b53fb3
add sleep to uploadtest so splunkd.log will exist in CI
24c759f
Increase UploadTest timeout to 8s
1c50b56
Revise README
PKing70 c1cb68b
fix uploadtest
ce2cac6
Ensure index tests restart before exiting
943a8a2
index tests should restart regardlesss of requirement to
e138922
use better format for temp files in UploadTest
376156b
restart when needed for delete index tests
ec9049c
Update upload test
e9a7686
Conflicts mergedUpdate CI configuration & README for new test environ…
59915bf
Update Java version parsing method
d35b2ee
Conflicts mergedInstall sdk-app-collection via docker-compose; add st…
amysutedja 1bcb4c0
Updated HttpService
ashah-splunk fd65704
Update HttpService.java
ashah-splunk 5c3318f
Project strcuture refactored as below:
bparmar-splunk ca4753a
Test specific file is changed to be compatible with maven.
bparmar-splunk 00bd0b8
Local deployment change implemented.
bparmar-splunk fae17d0
Maven deployed plugin is moved to Parent pom instead of splunk sub-mo…
bparmar-splunk 107c42e
Changes as per David's comments are added.
bparmar-splunk 6cd4b7a
Disable deprecated endpoint test cases
akaila-splunk 296acbc
Clean-up Javadoc generation
bparmar-splunk df9a72f
Ignored test cases due to change in REST API endpoint apps/appinstall
akaila-splunk 434e6cf
Changed filename for Linux os
akaila-splunk ae9a11c
Update HttpService.java
ashah-splunk 0011dd0
Github Actions - Test file added
bparmar-splunk 335c368
Test YAML modified
bparmar-splunk 5bdedd6
Location of docker-compose file changed.
bparmar-splunk 6da9dc6
Docker compose command omitted.
bparmar-splunk a19a215
SplunkRC file added
bparmar-splunk c5a6146
Environment variable (TCP & UDP Port) for Test command added.
bparmar-splunk 124635d
Github actions test.yml with splunk docker version 8.0
bparmar-splunk dfc44df
Testing test.yml with splunk docker instance v8.0 and latest.
bparmar-splunk 4a64915
Checking test.yml with splunk docker instance latest only
bparmar-splunk c873b62
Github Actions Test and release actions updated
bparmar-splunk 03bad07
Github actions release file updated with prerelease type
bparmar-splunk 83f51ff
POM modified for Github release action.
bparmar-splunk efdbdca
Skipping test in Github release actions.
bparmar-splunk 2361374
Examples pom modified.
bparmar-splunk 3210a22
Tests are skipped and distribution management added.
bparmar-splunk dde418a
BETA Release is reverted back to v1.6.5
bparmar-splunk 94121a0
CREDITS.md file has been added along with their respective licenses.
rmaheshwari-splunk 2a27e05
Release Notes
bparmar-splunk 19245b8
ChangeLog file modified.
bparmar-splunk 8150511
Merge branch 'release/1.7.0' of https://github.com/splunk/splunk-sdk-…
bparmar-splunk 3a54e7b
ChangeLog modified
bparmar-splunk 5d4ec68
POM files refactored.
bparmar-splunk ad95755
ChangeLog.md modified with all changes
bparmar-splunk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| on: | ||
| 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 }} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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) | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.