Skip to content

Commit f6172d0

Browse files
jaredpetersenjaredpetersen
authored
Merge pull request #2 from jaredpetersen/fix-development-docker-copy
fix development docs & maven jar build
2 parents 3f2143a + 6933850 commit f6172d0

File tree

5 files changed

+59
-71
lines changed

5 files changed

+59
-71
lines changed

‎docs/development/connect/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ ENV CONNECT_PLUGINS_DIR /usr/share/java/kafka-connect
77
RUN mkdir ${CONNECT_PLUGINS_DIR}
88

99
# Install Kafka Connect ArangoDB
10-
RUN mkdir ${CONNECT_PLUGINS_DIR}/kafka-connect-arangodb
11-
COPY ./target/kafka-connect-arangodb-*.jar ${CONNECT_PLUGINS_DIR}/kafka-connect-arangodb
10+
RUN mkdir ${CONNECT_PLUGINS_DIR}/kafka-connect-arangodb/
11+
COPY ./target/kafka-connect-arangodb-*.jar ${CONNECT_PLUGINS_DIR}/kafka-connect-arangodb/

‎pom.xml

+54-66
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>io.github.jaredpetersen</groupId>
77
<artifactId>kafka-connect-arangodb</artifactId>
8-
<version>1.0.2</version>
8+
<version>1.0.3</version>
99
<packaging>jar</packaging>
1010

1111
<name>kafka-connect-arangodb</name>
@@ -180,67 +180,71 @@
180180
</plugin>
181181

182182
<!-- Package as Confluent Hub Component Archive file -->
183-
<plugin>
184-
<groupId>io.confluent</groupId>
185-
<artifactId>kafka-connect-maven-plugin</artifactId>
186-
<version>${confluent.connect.plugin.version}</version>
187-
<executions>
188-
<execution>
189-
<!-- <phase>package</phase> -->
190-
<goals>
191-
<goal>kafka-connect</goal>
192-
</goals>
193-
<configuration>
194-
<title>Kafka Connect ArangoDB</title>
195-
<documentationUrl>${project.url}/blob/master/README.md</documentationUrl>
196-
<logo>docs/logos/arangodb-avocado-logo.png</logo>
197-
<ownerLogo>docs/logos/jaredpetersen-logo.png</ownerLogo>
198-
<ownerUsername>jaredpetersen</ownerUsername>
199-
<ownerType>user</ownerType>
200-
<ownerName>Jared Petersen</ownerName>
201-
<ownerUrl>https://github.com/jaredpetersen</ownerUrl>
202-
<supportProviderName>Open Source Community</supportProviderName>
203-
<supportSummary>Support provided through community involvement.</supportSummary>
204-
<supportUrl>${project.issueManagement.url}</supportUrl>
205-
<confluentControlCenterIntegration>true</confluentControlCenterIntegration>
206-
<componentTypes>
207-
<componentType>sink</componentType>
208-
</componentTypes>
209-
<requirements>
210-
<requirement>ArangoDB 3.4+</requirement>
211-
</requirements>
212-
<tags>
213-
<tag>arangodb</tag>
214-
<tag>arango</tag>
215-
<tag>graphdb</tag>
216-
<tag>graph</tag>
217-
<tag>nosql</tag>
218-
<tag>multimodel</tag>
219-
<tag>json</tag>
220-
</tags>
221-
</configuration>
222-
</execution>
223-
</executions>
224-
</plugin>
225-
226-
<!-- Package as uber JAR -->
227183
<plugin>
228-
<groupId>org.apache.maven.plugins</groupId>
229-
<artifactId>maven-shade-plugin</artifactId>
230-
<version>3.2.1</version>
184+
<groupId>io.confluent</groupId>
185+
<artifactId>kafka-connect-maven-plugin</artifactId>
186+
<version>${confluent.connect.plugin.version}</version>
231187
<executions>
232188
<execution>
233189
<phase>package</phase>
234190
<goals>
235-
<goal>shade</goal>
191+
<goal>kafka-connect</goal>
236192
</goals>
237193
<configuration>
238-
<minimizeJar>true</minimizeJar>
194+
<title>Kafka Connect ArangoDB</title>
195+
<documentationUrl>${project.url}/blob/master/README.md</documentationUrl>
196+
<logo>docs/logos/arangodb-avocado-logo.png</logo>
197+
<ownerLogo>docs/logos/jaredpetersen-logo.png</ownerLogo>
198+
<ownerUsername>jaredpetersen</ownerUsername>
199+
<ownerType>user</ownerType>
200+
<ownerName>Jared Petersen</ownerName>
201+
<ownerUrl>https://github.com/jaredpetersen</ownerUrl>
202+
<supportProviderName>Open Source Community</supportProviderName>
203+
<supportSummary>Support provided through community involvement.</supportSummary>
204+
<supportUrl>${project.issueManagement.url}</supportUrl>
205+
<confluentControlCenterIntegration>true</confluentControlCenterIntegration>
206+
<componentTypes>
207+
<componentType>sink</componentType>
208+
</componentTypes>
209+
<requirements>
210+
<requirement>ArangoDB 3.4+</requirement>
211+
</requirements>
212+
<tags>
213+
<tag>arangodb</tag>
214+
<tag>arango</tag>
215+
<tag>graph</tag>
216+
<tag>nosql</tag>
217+
<tag>multimodel</tag>
218+
<tag>json</tag>
219+
</tags>
239220
</configuration>
240221
</execution>
241222
</executions>
242223
</plugin>
243224

225+
<!-- Assemble JAR with dependencies -->
226+
<plugin>
227+
<groupId>org.apache.maven.plugins</groupId>
228+
<artifactId>maven-assembly-plugin</artifactId>
229+
<version>3.1.1</version>
230+
<configuration>
231+
<descriptorRefs>
232+
<descriptorRef>jar-with-dependencies</descriptorRef>
233+
</descriptorRefs>
234+
<finalName>${project.name}-${project.version}</finalName>
235+
<appendAssemblyId>false</appendAssemblyId>
236+
</configuration>
237+
<executions>
238+
<execution>
239+
<id>make-assembly</id>
240+
<phase>package</phase>
241+
<goals>
242+
<goal>single</goal>
243+
</goals>
244+
</execution>
245+
</executions>
246+
</plugin>
247+
244248
<!-- Attach sources -->
245249
<plugin>
246250
<groupId>org.apache.maven.plugins</groupId>
@@ -271,22 +275,6 @@
271275
</executions>
272276
</plugin>
273277

274-
<!-- Sign artifacts -->
275-
<!-- <plugin>
276-
<groupId>org.apache.maven.plugins</groupId>
277-
<artifactId>maven-gpg-plugin</artifactId>
278-
<version>1.6</version>
279-
<executions>
280-
<execution>
281-
<id>sign-artifacts</id>
282-
<phase>verify</phase>
283-
<goals>
284-
<goal>sign</goal>
285-
</goals>
286-
</execution>
287-
</executions>
288-
</plugin> -->
289-
290278
<!-- Deploy to Maven Central -->
291279
<plugin>
292280
<groupId>org.apache.maven.plugins</groupId>

‎src/test/java/io/github/jaredpetersen/kafkaconnectarangodb/sink/ArangoDbSinkConnectorTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class ArangoDbSinkConnectorTests {
1515
@Test
1616
public void versionReturnsVersion() {
1717
final SinkConnector connector = new ArangoDbSinkConnector();
18-
assertEquals("1.0.2", connector.version());
18+
assertEquals("1.0.3", connector.version());
1919
}
2020

2121
@Test

‎src/test/java/io/github/jaredpetersen/kafkaconnectarangodb/sink/ArangoDbSinkTaskTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class ArangoDbSinkTaskTests {
99
@Test
1010
public void versionReturnsVersion() {
1111
final SinkTask task = new ArangoDbSinkTask();
12-
assertEquals("1.0.2", task.version());
12+
assertEquals("1.0.3", task.version());
1313
}
1414

1515
@Test

‎src/test/java/io/github/jaredpetersen/kafkaconnectarangodb/util/PropertiesLoaderTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ public void constructorDoesNothing() {
1515
public void loadLoadsProperties() {
1616
final Properties properties = PropertiesLoader.load();
1717

18-
assertEquals("1.0.2", properties.get("version"));
18+
assertEquals("1.0.3", properties.get("version"));
1919
}
2020
}

0 commit comments

Comments
 (0)