Skip to content

Commit efff163

Browse files
Merge pull request #3 from jaredpetersen/update-checkstyle-sec-bug
update checkstyle security bug
2 parents f6172d0 + 162e909 commit efff163

File tree

9 files changed

+49
-16
lines changed

9 files changed

+49
-16
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Kafka Connect ArangoDB is a Kafka Connector that translates record data into `RE
99

1010
Requires ArangoDB 3.4 or higher.
1111

12-
A full example of how Kafka Connect ArangoDB can be integrated into a Kafka cluster is available in the [development documentation](docs/development/).
12+
A full example of how Kafka Connect ArangoDB can be integrated into a Kafka cluster is available in the [development documentation](/docs/development/).
1313

1414
### Record Formats and Structures
1515
The following record formats are supported:

config/quickstart-kafka-connect-arangodb-sink.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name=arangodb-sink
33
connector.class=com.mentor.kafka.kafkaconnectarangodb.sink.ArangoDBSinkConector
44
tasks.max=1
55

6-
# The topics to consume from (comma-separated for a list of multiple topics)
6+
# Topics to consume from (comma-separated for a list of multiple topics)
77
topics=stream.airports,stream.flights
88

99
# ArangoDB sink configuration
@@ -15,4 +15,4 @@ arangodb.database.name=kafka-connect-arangodb
1515

1616
# Optional transformers
1717
transforms=cdc
18-
transforms.cdc.type=com.mentor.kafka.kafkaconnectarangodb.sink.transforms.CDC
18+
transforms.cdc.type=io.github.jaredpetersen.kafkaconnectarangodb.sink.transforms.Cdc

docs/development/README.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,5 @@ Assuming the application has already been compiled and packaged via `mvn clean p
6565

6666
7. Clean up all containers and created volumes when you're done.
6767
```bash
68-
docker stop $(docker ps -aq)
69-
docker rm $(docker ps -aq)
70-
docker volume prune
68+
docker-compose down -v
7169
```

docs/development/connect/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ FROM confluentinc/cp-kafka-connect-base:${VERSION}
33

44
ENV CONNECT_PLUGINS_DIR /usr/share/java/kafka-connect
55

6-
# Create Plugin Directory
76
RUN mkdir ${CONNECT_PLUGINS_DIR}
87

98
# Install Kafka Connect ArangoDB

docs/release/README.md

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Release
2+
Only [@jaredpetersen](https://github.com/jaredpetersen) is able to deploy a new release of Kafka Connect ArangoDB. Always deploy a new version to Maven Central and Confluent Hub.
3+
4+
## GitHub
5+
1. Ensure that Kafka Connect ArangoDB's version was revised in the last merge to the master branch.
6+
2. Go to the [Releases section](https://github.com/jaredpetersen/kafka-connect-arangodb/releases) of the repository on GitHub.
7+
3. Draft a new release
8+
4. Fill the tag version input box with the new release version.
9+
5. Fill the release title input box with the new release version.
10+
6. Fill in the release description input bux with the recent changes using the [Keep a Changelog standard](https://keepachangelog.com/en/1.0.0/).
11+
7. Click the Publish release button.
12+
13+
## Maven Central
14+
1. Ensure that Kafka Connect ArangoDB's version was revised in the last merge to the master branch.
15+
2. Deploy the plugin to Maven Central for staging.
16+
```
17+
mvn clean deploy -Pdeploy
18+
```
19+
3. Log in to the [repository manager](https://oss.sonatype.org/) for Maven Central.
20+
4. Navigate to [Staging Repositories](https://oss.sonatype.org/#stagingRepositories) and locate the staged release in the listings.
21+
5. Click on the staged release and navigate to the Content tab.
22+
6. Confirm that the content is correct. As an additional measure, you can download the published jar and confirm that the JAR works in the [local development cluster](/docs/development).
23+
7. If the content is correct, close the release by clicking the Close button at the top.
24+
8. The repository manager will begin evaluating the releasability of the plugin against the [Maven Central requirements](https://central.sonatype.org/pages/requirements.html). Assuming that everything is good to go, release the plugin by clicking the Release button at the top.
25+
9. Drop the staged repository by clicking the Drop button at the top.
26+
10. Wait at least an hour and [confirm that the plugin has been updated](https://search.maven.org/search?q=g:io.github.jaredpetersen%20AND%20a:kafka-connect-arangodb&core=gav).
27+
28+
## Confluent Hub
29+
1. Ensure that Kafka Connect ArangoDB's version was revised in the last merge to the master branch.
30+
2. Package the plugin in Confluent Hub's archive format.
31+
```
32+
mvn clean package
33+
```
34+
3. Send an email to [[email protected]](mailto:[email protected]?Subject=Kafka%20Connect%20ArangoDB%20Plugin%20--%20New%20Version%20Submission) attached with the compressed component archive located at `/target/components/packages`. If the component archive is too large, upload it to a cloud storage provider and provide the link.

pom.xml

+8-6
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.3</version>
8+
<version>1.0.4</version>
99
<packaging>jar</packaging>
1010

1111
<name>kafka-connect-arangodb</name>
@@ -61,7 +61,6 @@
6161
<jackson.version>2.9.8</jackson.version>
6262
<junit.version>5.3.2</junit.version>
6363
<mockito.version>2.23.4</mockito.version>
64-
<confluent.connect.plugin.version>0.11.1</confluent.connect.plugin.version>
6564
</properties>
6665

6766
<build>
@@ -83,7 +82,7 @@
8382
<dependency>
8483
<groupId>com.puppycrawl.tools</groupId>
8584
<artifactId>checkstyle</artifactId>
86-
<version>8.16</version>
85+
<version>8.18</version>
8786
</dependency>
8887
</dependencies>
8988
<executions>
@@ -131,7 +130,7 @@
131130
<plugin>
132131
<groupId>org.jacoco</groupId>
133132
<artifactId>jacoco-maven-plugin</artifactId>
134-
<version>0.8.2</version>
133+
<version>0.8.3</version>
135134
<configuration>
136135
<excludes>
137136
<exclude>**/ArangoDbSinkTask.*</exclude>
@@ -183,7 +182,7 @@
183182
<plugin>
184183
<groupId>io.confluent</groupId>
185184
<artifactId>kafka-connect-maven-plugin</artifactId>
186-
<version>${confluent.connect.plugin.version}</version>
185+
<version>0.11.1</version>
187186
<executions>
188187
<execution>
189188
<phase>package</phase>
@@ -264,7 +263,7 @@
264263
<plugin>
265264
<groupId>org.apache.maven.plugins</groupId>
266265
<artifactId>maven-javadoc-plugin</artifactId>
267-
<version>3.0.1</version>
266+
<version>3.1.0</version>
268267
<executions>
269268
<execution>
270269
<id>attach-javadocs</id>
@@ -273,6 +272,9 @@
273272
</goals>
274273
</execution>
275274
</executions>
275+
<configuration>
276+
<source>${java.version}</source>
277+
</configuration>
276278
</plugin>
277279

278280
<!-- Deploy to Maven Central -->

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.3", connector.version());
18+
assertEquals("1.0.4", 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.3", task.version());
12+
assertEquals("1.0.4", 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.3", properties.get("version"));
18+
assertEquals("1.0.4", properties.get("version"));
1919
}
2020
}

0 commit comments

Comments
 (0)