Skip to content

Commit 123693b

Browse files
ashah-splunkashah-splunk
authored
Merge pull request #157 from splunk/DVPL-9534
Ant to Maven Migration As discussed, merging this PR based on one Approval
2 parents 4163332 + 3edaad4 commit 123693b

File tree

413 files changed

+2697
-154
lines changed

Some content is hidden

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

413 files changed

+2697
-154
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

‎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:

‎docker-compose.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3.6'
22

33
services:
44
splunk:
5-
image: "splunk/splunk:${SPLUNK_VERSION}"
5+
image: "splunk/splunk:8.0"
66
container_name: splunk
77
environment:
88
- SPLUNK_START_ARGS=--accept-license
@@ -13,6 +13,8 @@ services:
1313
- 8000:8000
1414
- 8088:8088
1515
- 8089:8089
16+
- 10667:10667
17+
- 10668:10668/udp
1618
healthcheck:
1719
test: ['CMD', 'curl', '-f', 'http://localhost:8000']
1820
interval: 5s

‎examples/pom.xml‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<artifactId>examples</artifactId>
8+
<parent>
9+
<artifactId>splunk-sdk-java</artifactId>
10+
<groupId>com.splunk</groupId>
11+
<version>1.0.0</version>
12+
</parent>
13+
14+
<build>
15+
<plugins>
16+
<plugin>
17+
<groupId>org.apache.maven.plugins</groupId>
18+
<artifactId>maven-surefire-plugin</artifactId>
19+
<version>3.0.0-M5</version>
20+
<configuration>
21+
<skipTests>true</skipTests>
22+
</configuration>
23+
</plugin>
24+
<plugin>
25+
<groupId>org.apache.maven.plugins</groupId>
26+
<artifactId>maven-deploy-plugin</artifactId>
27+
<configuration>
28+
<skip>true</skip>
29+
</configuration>
30+
</plugin>
31+
</plugins>
32+
</build>
33+
34+
<dependencies>
35+
<dependency>
36+
<groupId>com.splunk</groupId>
37+
<artifactId>splunk</artifactId>
38+
<version>1.6.5</version>
39+
<scope>provided</scope>
40+
</dependency>
41+
<dependency>
42+
<groupId>org.netbeans.api</groupId>
43+
<artifactId>org-openide-util-lookup</artifactId>
44+
<version>RELEASE124</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>org.netbeans.api</groupId>
48+
<artifactId>org-openide-util</artifactId>
49+
<version>RELEASE124</version>
50+
</dependency>
51+
<dependency>
52+
<groupId>org.netbeans.api</groupId>
53+
<artifactId>org-openide-filesystems</artifactId>
54+
<version>RELEASE124</version>
55+
</dependency>
56+
<dependency>
57+
<groupId>org.netbeans.api</groupId>
58+
<artifactId>org-openide-awt</artifactId>
59+
<version>RELEASE124</version>
60+
</dependency>
61+
<dependency>
62+
<groupId>org.netbeans.api</groupId>
63+
<artifactId>org-openide-dialogs</artifactId>
64+
<version>RELEASE124</version>
65+
</dependency>
66+
<dependency>
67+
<groupId>org.netbeans.api</groupId>
68+
<artifactId>org-openide-nodes</artifactId>
69+
<version>RELEASE124</version>
70+
</dependency>
71+
<dependency>
72+
<groupId>org.netbeans.api</groupId>
73+
<artifactId>org-openide-explorer</artifactId>
74+
<version>RELEASE124</version>
75+
</dependency>
76+
<dependency>
77+
<groupId>org.netbeans.api</groupId>
78+
<artifactId>org-openide-execution</artifactId>
79+
<version>RELEASE124</version>
80+
</dependency>
81+
<dependency>
82+
<groupId>org.netbeans.api</groupId>
83+
<artifactId>org-openide-modules</artifactId>
84+
<version>RELEASE124</version>
85+
</dependency>
86+
<dependency>
87+
<groupId>org.netbeans.api</groupId>
88+
<artifactId>org-openide-windows</artifactId>
89+
<version>RELEASE124</version>
90+
</dependency>
91+
<dependency>
92+
<groupId>org.netbeans.api</groupId>
93+
<artifactId>org-openide-text</artifactId>
94+
<version>RELEASE124</version>
95+
</dependency>
96+
<dependency>
97+
<groupId>org.netbeans.api</groupId>
98+
<artifactId>org-openide-options</artifactId>
99+
<version>RELEASE124</version>
100+
</dependency>
101+
<dependency>
102+
<groupId>org.netbeans.api</groupId>
103+
<artifactId>org-openide-loaders</artifactId>
104+
<version>RELEASE124</version>
105+
</dependency>
106+
<dependency>
107+
<groupId>org.netbeans.api</groupId>
108+
<artifactId>org-openide-io</artifactId>
109+
<version>RELEASE124</version>
110+
</dependency>
111+
<dependency>
112+
<groupId>org.netbeans.api</groupId>
113+
<artifactId>org-openide-actions</artifactId>
114+
<version>RELEASE124</version>
115+
</dependency>
116+
</dependencies>
117+
118+
</project>

examples/com/splunk/examples/endpoint_instantiation/Program.java renamed to examples/src/main/java/com/splunk/examples/endpoint_instantiation/Program.java

File renamed without changes.

examples/com/splunk/examples/explorer/AppNode.java renamed to examples/src/main/java/com/splunk/examples/explorer/AppNode.java

File renamed without changes.

examples/com/splunk/examples/explorer/ConfCollectionKids.java renamed to examples/src/main/java/com/splunk/examples/explorer/ConfCollectionKids.java

File renamed without changes.

examples/com/splunk/examples/explorer/ConfCollectionNode.java renamed to examples/src/main/java/com/splunk/examples/explorer/ConfCollectionNode.java

File renamed without changes.

examples/com/splunk/examples/explorer/DatePropertyEditor.java renamed to examples/src/main/java/com/splunk/examples/explorer/DatePropertyEditor.java

File renamed without changes.

examples/com/splunk/examples/explorer/DeploymentClientNode.java renamed to examples/src/main/java/com/splunk/examples/explorer/DeploymentClientNode.java

File renamed without changes.

0 commit comments

Comments
 (0)