Skip to content

Commit 7b3774a

Browse files
committed
Merge remote-tracking branch 'origin/develop' into DVPL-9265
2 parents 700ed3b + f4c99f8 commit 7b3774a

File tree

415 files changed

+2834
-676
lines changed

Some content is hidden

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

415 files changed

+2834
-676
lines changed

.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.

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ init:
2424
.PHONY: test
2525
test:
2626
@echo "$(ATTN_COLOR)==> test $(NO_COLOR)"
27-
@ant test
27+
# @ant test
28+
@mvn test
2829

2930
.PHONY: test_specific
3031
test_specific:

0 commit comments

Comments
 (0)