Skip to content

Commit

Permalink
Merge pull request #2 from jaredpetersen/fix-development-docker-copy
Browse files Browse the repository at this point in the history
fix development docs & maven jar build
  • Loading branch information
jaredpetersen authored Jan 31, 2019
2 parents 3f2143a + 6933850 commit f6172d0
Show file tree
Hide file tree
Showing 5 changed files with 59 additions and 71 deletions.
4 changes: 2 additions & 2 deletions docs/development/connect/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ ENV CONNECT_PLUGINS_DIR /usr/share/java/kafka-connect
RUN mkdir ${CONNECT_PLUGINS_DIR}

# Install Kafka Connect ArangoDB
RUN mkdir ${CONNECT_PLUGINS_DIR}/kafka-connect-arangodb
COPY ./target/kafka-connect-arangodb-*.jar ${CONNECT_PLUGINS_DIR}/kafka-connect-arangodb
RUN mkdir ${CONNECT_PLUGINS_DIR}/kafka-connect-arangodb/
COPY ./target/kafka-connect-arangodb-*.jar ${CONNECT_PLUGINS_DIR}/kafka-connect-arangodb/
120 changes: 54 additions & 66 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>io.github.jaredpetersen</groupId>
<artifactId>kafka-connect-arangodb</artifactId>
<version>1.0.2</version>
<version>1.0.3</version>
<packaging>jar</packaging>

<name>kafka-connect-arangodb</name>
Expand Down Expand Up @@ -180,67 +180,71 @@
</plugin>

<!-- Package as Confluent Hub Component Archive file -->
<plugin>
<groupId>io.confluent</groupId>
<artifactId>kafka-connect-maven-plugin</artifactId>
<version>${confluent.connect.plugin.version}</version>
<executions>
<execution>
<!-- <phase>package</phase> -->
<goals>
<goal>kafka-connect</goal>
</goals>
<configuration>
<title>Kafka Connect ArangoDB</title>
<documentationUrl>${project.url}/blob/master/README.md</documentationUrl>
<logo>docs/logos/arangodb-avocado-logo.png</logo>
<ownerLogo>docs/logos/jaredpetersen-logo.png</ownerLogo>
<ownerUsername>jaredpetersen</ownerUsername>
<ownerType>user</ownerType>
<ownerName>Jared Petersen</ownerName>
<ownerUrl>https://github.com/jaredpetersen</ownerUrl>
<supportProviderName>Open Source Community</supportProviderName>
<supportSummary>Support provided through community involvement.</supportSummary>
<supportUrl>${project.issueManagement.url}</supportUrl>
<confluentControlCenterIntegration>true</confluentControlCenterIntegration>
<componentTypes>
<componentType>sink</componentType>
</componentTypes>
<requirements>
<requirement>ArangoDB 3.4+</requirement>
</requirements>
<tags>
<tag>arangodb</tag>
<tag>arango</tag>
<tag>graphdb</tag>
<tag>graph</tag>
<tag>nosql</tag>
<tag>multimodel</tag>
<tag>json</tag>
</tags>
</configuration>
</execution>
</executions>
</plugin>

<!-- Package as uber JAR -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<groupId>io.confluent</groupId>
<artifactId>kafka-connect-maven-plugin</artifactId>
<version>${confluent.connect.plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
<goal>kafka-connect</goal>
</goals>
<configuration>
<minimizeJar>true</minimizeJar>
<title>Kafka Connect ArangoDB</title>
<documentationUrl>${project.url}/blob/master/README.md</documentationUrl>
<logo>docs/logos/arangodb-avocado-logo.png</logo>
<ownerLogo>docs/logos/jaredpetersen-logo.png</ownerLogo>
<ownerUsername>jaredpetersen</ownerUsername>
<ownerType>user</ownerType>
<ownerName>Jared Petersen</ownerName>
<ownerUrl>https://github.com/jaredpetersen</ownerUrl>
<supportProviderName>Open Source Community</supportProviderName>
<supportSummary>Support provided through community involvement.</supportSummary>
<supportUrl>${project.issueManagement.url}</supportUrl>
<confluentControlCenterIntegration>true</confluentControlCenterIntegration>
<componentTypes>
<componentType>sink</componentType>
</componentTypes>
<requirements>
<requirement>ArangoDB 3.4+</requirement>
</requirements>
<tags>
<tag>arangodb</tag>
<tag>arango</tag>
<tag>graph</tag>
<tag>nosql</tag>
<tag>multimodel</tag>
<tag>json</tag>
</tags>
</configuration>
</execution>
</executions>
</plugin>

<!-- Assemble JAR with dependencies -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<finalName>${project.name}-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- Attach sources -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -271,22 +275,6 @@
</executions>
</plugin>

<!-- Sign artifacts -->
<!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin> -->

<!-- Deploy to Maven Central -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class ArangoDbSinkConnectorTests {
@Test
public void versionReturnsVersion() {
final SinkConnector connector = new ArangoDbSinkConnector();
assertEquals("1.0.2", connector.version());
assertEquals("1.0.3", connector.version());
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public class ArangoDbSinkTaskTests {
@Test
public void versionReturnsVersion() {
final SinkTask task = new ArangoDbSinkTask();
assertEquals("1.0.2", task.version());
assertEquals("1.0.3", task.version());
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ public void constructorDoesNothing() {
public void loadLoadsProperties() {
final Properties properties = PropertiesLoader.load();

assertEquals("1.0.2", properties.get("version"));
assertEquals("1.0.3", properties.get("version"));
}
}

0 comments on commit f6172d0

Please sign in to comment.