Skip to content

Commit d540004

Browse files
author
Donald Tregonning
authored
Merge pull request #168 from splunk/issue-138/header-support
Issue 138/header support
2 parents af1f5ac + fe2a90e commit d540004

File tree

15 files changed

+1914
-133
lines changed

15 files changed

+1914
-133
lines changed

‎dependency-reduced-pom.xml‎

Lines changed: 1 addition & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.github.splunk.kafka.connect</groupId>
55
<artifactId>splunk-kafka-connect</artifactId>
66
<name>splunk-kafka-connect</name>
7-
<version>v1.0.0-LAR</version>
7+
<version>v1.1.0</version>
88
<build>
99
<plugins>
1010
<plugin>
@@ -115,36 +115,6 @@
115115
</plugins>
116116
</build>
117117
<dependencies>
118-
<dependency>
119-
<groupId>com.fasterxml.jackson.core</groupId>
120-
<artifactId>jackson-core</artifactId>
121-
<version>2.9.5</version>
122-
<scope>provided</scope>
123-
</dependency>
124-
<dependency>
125-
<groupId>com.fasterxml.jackson.core</groupId>
126-
<artifactId>jackson-databind</artifactId>
127-
<version>2.9.5</version>
128-
<scope>provided</scope>
129-
<exclusions>
130-
<exclusion>
131-
<artifactId>jackson-annotations</artifactId>
132-
<groupId>com.fasterxml.jackson.core</groupId>
133-
</exclusion>
134-
</exclusions>
135-
</dependency>
136-
<dependency>
137-
<groupId>org.apache.kafka</groupId>
138-
<artifactId>connect-api</artifactId>
139-
<version>1.1.0</version>
140-
<scope>provided</scope>
141-
<exclusions>
142-
<exclusion>
143-
<artifactId>kafka-clients</artifactId>
144-
<groupId>org.apache.kafka</groupId>
145-
</exclusion>
146-
</exclusions>
147-
</dependency>
148118
<dependency>
149119
<groupId>org.junit.jupiter</groupId>
150120
<artifactId>junit-jupiter-api</artifactId>
@@ -209,42 +179,18 @@
209179
</exclusion>
210180
</exclusions>
211181
</dependency>
212-
<dependency>
213-
<groupId>commons-logging</groupId>
214-
<artifactId>commons-logging</artifactId>
215-
<version>1.2</version>
216-
<scope>provided</scope>
217-
</dependency>
218-
<dependency>
219-
<groupId>commons-codec</groupId>
220-
<artifactId>commons-codec</artifactId>
221-
<version>1.11</version>
222-
<scope>provided</scope>
223-
</dependency>
224182
<dependency>
225183
<groupId>org.slf4j</groupId>
226184
<artifactId>slf4j-simple</artifactId>
227185
<version>1.7.25</version>
228186
<scope>test</scope>
229187
</dependency>
230-
<dependency>
231-
<groupId>org.slf4j</groupId>
232-
<artifactId>slf4j-api</artifactId>
233-
<version>1.7.25</version>
234-
<scope>provided</scope>
235-
</dependency>
236188
<dependency>
237189
<groupId>org.apiguardian</groupId>
238190
<artifactId>apiguardian-api</artifactId>
239191
<version>1.0.0</version>
240192
<scope>test</scope>
241193
</dependency>
242-
<dependency>
243-
<groupId>org.apache.commons</groupId>
244-
<artifactId>commons-lang3</artifactId>
245-
<version>3.7</version>
246-
<scope>provided</scope>
247-
</dependency>
248194
</dependencies>
249195
<reporting>
250196
<plugins>

‎kafka-connect-splunk.iml‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,18 @@
1212
</content>
1313
<orderEntry type="inheritedJdk" />
1414
<orderEntry type="sourceFolder" forTests="false" />
15-
<orderEntry type="library" scope="PROVIDED" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.5" level="project" />
16-
<orderEntry type="library" scope="PROVIDED" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.5" level="project" />
17-
<orderEntry type="library" scope="PROVIDED" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
18-
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.kafka:connect-api:1.1.0" level="project" />
19-
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.kafka:kafka-clients:1.1.0" level="project" />
20-
<orderEntry type="library" scope="PROVIDED" name="Maven: org.lz4:lz4-java:1.4" level="project" />
21-
<orderEntry type="library" scope="PROVIDED" name="Maven: org.xerial.snappy:snappy-java:1.1.7.1" level="project" />
15+
<orderEntry type="library" name="Maven: org.apache.kafka:connect-api:2.0.0" level="project" />
16+
<orderEntry type="library" name="Maven: org.apache.kafka:kafka-clients:2.0.0" level="project" />
17+
<orderEntry type="library" name="Maven: org.lz4:lz4-java:1.4.1" level="project" />
18+
<orderEntry type="library" name="Maven: javax.ws.rs:javax.ws.rs-api:2.1" level="project" />
19+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.5" level="project" />
20+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.5" level="project" />
21+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
22+
<orderEntry type="library" name="Maven: org.apache.kafka:connect-api:2.0.0" level="project" />
23+
<orderEntry type="library" name="Maven: org.apache.kafka:kafka-clients:2.0.0" level="project" />
24+
<orderEntry type="library" name="Maven: org.lz4:lz4-java:1.4.1" level="project" />
25+
<orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.7.1" level="project" />
26+
<orderEntry type="library" name="Maven: javax.ws.rs:javax.ws.rs-api:2.1" level="project" />
2227
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.0.1" level="project" />
2328
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.0.0" level="project" />
2429
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.0.1" level="project" />
@@ -30,12 +35,12 @@
3035
<orderEntry type="library" scope="TEST" name="Maven: org.junit.vintage:junit-vintage-engine:4.12.1" level="project" />
3136
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.3" level="project" />
3237
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.6" level="project" />
33-
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.2" level="project" />
34-
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-codec:commons-codec:1.11" level="project" />
38+
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
39+
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
3540
<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-simple:1.7.25" level="project" />
36-
<orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
41+
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
3742
<orderEntry type="library" name="Maven: commons-cli:commons-cli:1.4" level="project" />
3843
<orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.0.0" level="project" />
39-
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
44+
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
4045
</component>
4146
</module>

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,4 +296,4 @@
296296

297297
</plugins>
298298
</build>
299-
</project>
299+
</project>

0 commit comments

Comments
 (0)