Skip to content

Update checkstyle security bug #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Kafka Connect ArangoDB is a Kafka Connector that translates record data into `RE

Requires ArangoDB 3.4 or higher.

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

### Record Formats and Structures
The following record formats are supported:
Expand Down
4 changes: 2 additions & 2 deletions config/quickstart-kafka-connect-arangodb-sink.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name=arangodb-sink
connector.class=com.mentor.kafka.kafkaconnectarangodb.sink.ArangoDBSinkConector
tasks.max=1

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

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

# Optional transformers
transforms=cdc
transforms.cdc.type=com.mentor.kafka.kafkaconnectarangodb.sink.transforms.CDC
transforms.cdc.type=io.github.jaredpetersen.kafkaconnectarangodb.sink.transforms.Cdc
4 changes: 1 addition & 3 deletions docs/development/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,5 @@ Assuming the application has already been compiled and packaged via `mvn clean p

7. Clean up all containers and created volumes when you're done.
```bash
docker stop $(docker ps -aq)
docker rm $(docker ps -aq)
docker volume prune
docker-compose down -v
```
1 change: 0 additions & 1 deletion docs/development/connect/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ FROM confluentinc/cp-kafka-connect-base:${VERSION}

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

# Create Plugin Directory
RUN mkdir ${CONNECT_PLUGINS_DIR}

# Install Kafka Connect ArangoDB
Expand Down
34 changes: 34 additions & 0 deletions docs/release/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Release
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.

## GitHub
1. Ensure that Kafka Connect ArangoDB's version was revised in the last merge to the master branch.
2. Go to the [Releases section](https://github.com/jaredpetersen/kafka-connect-arangodb/releases) of the repository on GitHub.
3. Draft a new release
4. Fill the tag version input box with the new release version.
5. Fill the release title input box with the new release version.
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/).
7. Click the Publish release button.

## Maven Central
1. Ensure that Kafka Connect ArangoDB's version was revised in the last merge to the master branch.
2. Deploy the plugin to Maven Central for staging.
```
mvn clean deploy -Pdeploy
```
3. Log in to the [repository manager](https://oss.sonatype.org/) for Maven Central.
4. Navigate to [Staging Repositories](https://oss.sonatype.org/#stagingRepositories) and locate the staged release in the listings.
5. Click on the staged release and navigate to the Content tab.
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).
7. If the content is correct, close the release by clicking the Close button at the top.
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.
9. Drop the staged repository by clicking the Drop button at the top.
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).

## Confluent Hub
1. Ensure that Kafka Connect ArangoDB's version was revised in the last merge to the master branch.
2. Package the plugin in Confluent Hub's archive format.
```
mvn clean package
```
3. Send an email to [confluent-hub@confluent.io](mailto:confluent-hub@confluent.io?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.
14 changes: 8 additions & 6 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.3</version>
<version>1.0.4</version>
<packaging>jar</packaging>

<name>kafka-connect-arangodb</name>
Expand Down Expand Up @@ -61,7 +61,6 @@
<jackson.version>2.9.8</jackson.version>
<junit.version>5.3.2</junit.version>
<mockito.version>2.23.4</mockito.version>
<confluent.connect.plugin.version>0.11.1</confluent.connect.plugin.version>
</properties>

<build>
Expand All @@ -83,7 +82,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>8.16</version>
<version>8.18</version>
</dependency>
</dependencies>
<executions>
Expand Down Expand Up @@ -131,7 +130,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.2</version>
<version>0.8.3</version>
<configuration>
<excludes>
<exclude>**/ArangoDbSinkTask.*</exclude>
Expand Down Expand Up @@ -183,7 +182,7 @@
<plugin>
<groupId>io.confluent</groupId>
<artifactId>kafka-connect-maven-plugin</artifactId>
<version>${confluent.connect.plugin.version}</version>
<version>0.11.1</version>
<executions>
<execution>
<phase>package</phase>
Expand Down Expand Up @@ -264,7 +263,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
<version>3.1.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -273,6 +272,9 @@
</goals>
</execution>
</executions>
<configuration>
<source>${java.version}</source>
</configuration>
</plugin>

<!-- Deploy to Maven Central -->
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.3", connector.version());
assertEquals("1.0.4", 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.3", task.version());
assertEquals("1.0.4", 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.3", properties.get("version"));
assertEquals("1.0.4", properties.get("version"));
}
}