This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
The following commit(s) were added to refs/heads/master by this push:
new a5af334 Upgrade to Strimzi 0.20.0 and kafka-2.6.0
a5af334 is described below
commit a5af334bdcedba6517753d17e83112531f387a23
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Mon Oct 26 15:08:43 2020 +0100
Upgrade to Strimzi 0.20.0 and kafka-2.6.0
---
.../automatic-sync-camel-master-strimzi-next.yml | 96 ----------------------
parent/pom.xml | 18 +---
2 files changed, 3 insertions(+), 111 deletions(-)
diff --git a/.github/workflows/automatic-sync-camel-master-strimzi-next.yml
b/.github/workflows/automatic-sync-camel-master-strimzi-next.yml
deleted file mode 100644
index ac5bafe..0000000
--- a/.github/workflows/automatic-sync-camel-master-strimzi-next.yml
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-# 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
-#
-# 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.
-#
-
-name: Sync Camel Kafka Connector camel-master Branch with Strimzi next
-
-env:
- MAVEN_ARGS: -V -ntp
-
-on:
- schedule:
- # Run at 3 AM every day
- - cron: '0 3 * * *'
- workflow_dispatch:
-jobs:
- build:
- name: Sync Camel Kafka Connector camel-master Branch
- runs-on: ubuntu-latest
- strategy:
- matrix:
- java: [ '11' ]
- steps:
- - name: Checkout Camel project
- uses: actions/checkout@v2
- with:
- repository: apache/camel
- ref: master
- path: camel
- - name: Set up JDK ${{ matrix.java }}
- uses: AdoptOpenJDK/install-jdk@v1
- with:
- version: ${{ matrix.java }}
- - name: Cache local Maven repository
- uses: actions/cache@v2
- with:
- path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
- restore-keys: |
- ${{ runner.os }}-maven-
- - name: Build Camel Project
- run: |
- ./mvnw ${MAVEN_ARGS} \
- -DskipTests \
- clean install
- working-directory: ${{ github.workspace }}/camel
- - name: Checkout camel-kafka-connector project
- uses: actions/checkout@v2
- with:
- ref: camel-master
- fetch-depth: 0
- # first command builds the source check module,
- - name: build tools
- run: |
- ./mvnw ${MAVEN_ARGS} \
- -DskipTests \
- -pl :parent \
- -pl :camel-kafka-connector-aggregator \
- -pl :camel-buildtools \
- clean install
- # second one source check and install
:camel-kafka-connector-generator-maven-plugin
- # this is needed to add maven plugin metadata to it,
- - name: build connector-generator-plugin
- run: |
- ./mvnw ${MAVEN_ARGS} \
- -Dcheckstyle.failOnViolation=true \
- -Psourcecheck \
- -DskipTests \
- -pl :camel-kafka-connector-model \
- -pl :camel-kafka-connector-generator-maven-plugin \
- clean install
- # third command source check everything else but
:camel-kafka-connector-generator-maven-plugin
- - name: build and itests
- run: |
- ./mvnw ${MAVEN_ARGS} \
- -Dcheckstyle.failOnViolation=true \
- -Psourcecheck \
- -Pstrimzinext \
- -DskipIntegrationTests=false \
- -Dhttp.keepAlive=false \
- -Dmaven.wagon.http.pool=false \
- -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \
- -pl '!:camel-kafka-connector-generator-maven-plugin' \
- clean test
\ No newline at end of file
diff --git a/parent/pom.xml b/parent/pom.xml
index a3c0fac..ea463e1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -27,7 +27,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <kafka.version>2.5.0</kafka.version>
+ <kafka.version>2.6.0</kafka.version>
<camel.version>3.6.0</camel.version>
<version.java>1.8</version.java>
<version.guava>20.0</version.guava>
@@ -57,8 +57,8 @@
<gmavenplus-plugin-version>1.6.2</gmavenplus-plugin-version>
<groovy-version>2.5.8</groovy-version>
-
<itest.zookeeper.container.image>strimzi/kafka:0.19.0-kafka-2.5.0</itest.zookeeper.container.image>
-
<itest.strimzi.container.image>strimzi/kafka:0.19.0-kafka-2.5.0</itest.strimzi.container.image>
+
<itest.zookeeper.container.image>strimzi/kafka:0.20.0-kafka-2.6.0</itest.zookeeper.container.image>
+
<itest.strimzi.container.image>strimzi/kafka:0.20.0-kafka-2.6.0</itest.strimzi.container.image>
<checkstyle.failOnViolation>false</checkstyle.failOnViolation>
</properties>
@@ -519,18 +519,6 @@
<profiles>
<profile>
- <id>strimzinext</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
- <kafka.version>2.6.0</kafka.version>
-
<itest.zookeeper.container.image>strimzi/kafka:0.20.0-rc3-kafka-2.6.0</itest.zookeeper.container.image>
-
<itest.strimzi.container.image>strimzi/kafka:0.20.0-rc3-kafka-2.6.0</itest.strimzi.container.image>
-
<kafka.instance.type>local-strimzi-container</kafka.instance.type>
- </properties>
- </profile>
- <profile>
<id>sourcecheck</id>
<build>
<plugins>
