You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by va...@apache.org on 2020/01/13 09:12:13 UTC
[camel-kafka-connector] branch master updated (84ea014 -> b1ef1a0)
This is an automated email from the ASF dual-hosted git repository.
valdar pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git.
from 84ea014 Updated integration test image to kafka 2.4
new ca26346 Added sourcecheck to github actions, added master push github action workflow and badge in readme.
new b1ef1a0 Fixed codestyle in itests
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../{pr-build.yml => master-pr-build.yml} | 8 ++++---
.../{pr-build.yml => master-push-build.yml} | 20 ++++++++--------
README.adoc | 1 +
parent/pom.xml | 11 ++++++++-
.../services/kafka/StrimziContainer.java | 25 ++++++++++----------
.../services/kafka/ZookeeperContainer.java | 27 +++++++++++-----------
6 files changed, 54 insertions(+), 38 deletions(-)
copy .github/workflows/{pr-build.yml => master-pr-build.yml} (79%)
rename .github/workflows/{pr-build.yml => master-push-build.yml} (66%)
[camel-kafka-connector] 01/02: Added sourcecheck to github actions,
added master push github action workflow and badge in readme.
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
valdar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit ca263464838e521dbd6d4dfcd3a0f0314f10b9cc
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Mon Jan 13 00:44:42 2020 +0100
Added sourcecheck to github actions, added master push github action workflow and badge in readme.
---
.../workflows/{pr-build.yml => master-pr-build.yml} | 8 +++++---
.../{pr-build.yml => master-push-build.yml} | 20 +++++++++++---------
README.adoc | 1 +
parent/pom.xml | 9 +++++++++
4 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/master-pr-build.yml
similarity index 79%
copy from .github/workflows/pr-build.yml
copy to .github/workflows/master-pr-build.yml
index c331ad5..37c750c 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/master-pr-build.yml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-name: Build PR
+name: master pr build
on:
pull_request:
@@ -33,5 +33,7 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}
- - name: mvn verify
- run: ./mvnw -V --no-transfer-progress clean install -DskipIntegrationTests=false
+ - name: mvn sourcecheck
+ run: ./mvnw -V --no-transfer-progress -Dcheckstyle.failOnViolation=true -Psourcecheck -DskipTests clean verify
+ - name: mvn build and itests
+ run: ./mvnw -V --no-transfer-progress -DskipIntegrationTests=false clean install
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/master-push-build.yml
similarity index 66%
rename from .github/workflows/pr-build.yml
rename to .github/workflows/master-push-build.yml
index c331ad5..d36e1bd 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/master-push-build.yml
@@ -15,10 +15,10 @@
# limitations under the License.
#
-name: Build PR
+name: master build
on:
- pull_request:
+ push:
branches:
- master
jobs:
@@ -28,10 +28,12 @@ jobs:
matrix:
java: [ '1.8', '11' ]
steps:
- - uses: actions/checkout@v1
- - name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v1
- with:
- java-version: ${{ matrix.java }}
- - name: mvn verify
- run: ./mvnw -V --no-transfer-progress clean install -DskipIntegrationTests=false
+ - uses: actions/checkout@v1
+ - name: Set up JDK ${{ matrix.java }}
+ uses: actions/setup-java@v1
+ with:
+ java-version: ${{ matrix.java }}
+ - name: mvn sourcecheck
+ run: ./mvnw -V --no-transfer-progress -Dcheckstyle.failOnViolation=true -Psourcecheck -DskipTests clean verify
+ - name: mvn build and itests
+ run: ./mvnw -V --no-transfer-progress -DskipIntegrationTests=false clean install
diff --git a/README.adoc b/README.adoc
index d2db51a..0f8d3f8 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,6 +1,7 @@
== Camel Kafka Connector
image:https://img.shields.io/gitter/room/apache/camel-kafka-connector["Chat on Gitter", link="https://gitter.im/apache/camel-kafka-connector"]
+image:https://github.com/apache/camel-kafka-connector/workflows/master%20build/badge.svg[Master Build, link="https://github.com/apache/camel-kafka-connector/actions?query=workflow%3A%22master+build%22"]
=== Introduction
[NOTE]
diff --git a/parent/pom.xml b/parent/pom.xml
index a9cdf46..e2f9255 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -62,6 +62,7 @@
<version.scala.library>2.12.4</version.scala.library>
<version.testcontainers>1.12.4</version.testcontainers>
<version.qpid-jms-client>0.40.0</version.qpid-jms-client>
+ <version.maven.maven-remote-resources-plugin>1.6.0</version.maven.maven-remote-resources-plugin>
<version.maven.checkstyle>8.26</version.maven.checkstyle>
<version.maven.checkstyle.plugin>3.1.0</version.maven.checkstyle.plugin>
@@ -70,6 +71,8 @@
<itest.zookeeper.container.image>strimzi/kafka:0.16.0-rc1-kafka-2.4.0</itest.zookeeper.container.image>
<itest.strimzi.container.image>strimzi/kafka:0.16.0-rc1-kafka-2.4.0</itest.strimzi.container.image>
+
+ <checkstyle.failOnViolation>false</checkstyle.failOnViolation>
</properties>
<repositories>
@@ -386,6 +389,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>${version.maven.maven-remote-resources-plugin}</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${version.maven.checkstyle.plugin}</version>
<dependencies>
[camel-kafka-connector] 02/02: Fixed codestyle in itests
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
valdar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit b1ef1a01c4e87626011c8e7163000e0069f39fba
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Mon Jan 13 09:55:34 2020 +0100
Fixed codestyle in itests
---
parent/pom.xml | 2 +-
.../services/kafka/StrimziContainer.java | 25 ++++++++++----------
.../services/kafka/ZookeeperContainer.java | 27 +++++++++++-----------
3 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index e2f9255..531583a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -427,7 +427,7 @@
<headerLocation>header-java.txt</headerLocation>
<includes>**/*.java,**/*.groovy,**/*.scala,**/*.properties,**/*.xml,**/*.xsd</includes>
<excludes>
- **/archetype-resources/**/*.java,**/archetype-resources/**/*.groovy,**/archetype-resources/**/*.scala,**/archetype-resources/**/*.xml,**/org/json/simple/**/*.java
+ **/archetype-resources/**/*.java,**/archetype-resources/**/*.groovy,**/archetype-resources/**/*.scala,**/archetype-resources/**/*.xml,**/org/json/simple/**/*.java,**/camel-checkstyle.xml
</excludes>
</configuration>
<goals>
diff --git a/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/StrimziContainer.java b/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/StrimziContainer.java
index 748a1d1..0b7e45d 100644
--- a/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/StrimziContainer.java
+++ b/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/StrimziContainer.java
@@ -1,23 +1,24 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.camel.kafkaconnector.services.kafka;
import java.util.function.Consumer;
+
import com.github.dockerjava.api.command.CreateContainerCmd;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.Network;
diff --git a/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/ZookeeperContainer.java b/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/ZookeeperContainer.java
index 4051b94..c6d81f1 100644
--- a/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/ZookeeperContainer.java
+++ b/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/ZookeeperContainer.java
@@ -1,23 +1,24 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.camel.kafkaconnector.services.kafka;
import java.util.function.Consumer;
+
import com.github.dockerjava.api.command.CreateContainerCmd;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.Network;
@@ -43,7 +44,7 @@ public class ZookeeperContainer extends GenericContainer {
}
);
- withCommand( "sh", "-c",
+ withCommand("sh", "-c",
"bin/zookeeper-server-start.sh config/zookeeper.properties");
waitingFor(Wait.forListeningPort());