You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2020/10/16 19:45:41 UTC
[camel-quarkus] branch release/1.3.0 updated (cbb07f9 -> 8f9336b)
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a change to branch release/1.3.0
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard cbb07f9 HBase integration tests fail with Camel 3.6.0 Fix #1914
discard 64f889e Enable Camel 3.6.0 staging repository temporarily
new 494e006 Enable Camel 3.6.0 staging repository temporarily
new 8f9336b HBase integration tests fail with Camel 3.6.0 Fix #1914
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (cbb07f9)
\
N -- N -- N refs/heads/release/1.3.0 (8f9336b)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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:
.github/workflows/ci-build.yaml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
[camel-quarkus] 01/02: Enable Camel 3.6.0 staging repository
temporarily
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch release/1.3.0
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 494e00657ab0a27e5e463e3d41c735d72d42b42f
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Fri Oct 16 17:53:25 2020 +0200
Enable Camel 3.6.0 staging repository temporarily
---
.github/workflows/ci-build.yaml | 25 +++++++++++++++
settings-camel-3.6.0.xml | 69 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 94 insertions(+)
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index c5f6b6d..2d6a07d 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -23,6 +23,7 @@ on:
- master
- camel-master
- quarkus-master
+ - release/1.3.0
- "[0-9]+.[0-9]+.x"
paths-ignore:
- '**.adoc'
@@ -70,6 +71,10 @@ jobs:
if: github.ref == 'refs/heads/quarkus-master' || github.base_ref == 'quarkus-master'
run: |
echo '::set-env name=BRANCH_OPTIONS::-Poss-snapshots -Dquarkus.version=999-SNAPSHOT'
+ - name: Enable Camel 3.6.0 staging repo
+ if: github.ref == 'refs/heads/release/1.3.0'
+ run: |
+ echo '::set-env name=BRANCH_OPTIONS::-s '$(pwd)'/settings-camel-3.6.0.xml'
- name: Set up JDK 11
uses: AdoptOpenJDK/install-jdk@v1
with:
@@ -126,6 +131,10 @@ jobs:
if: github.ref == 'refs/heads/quarkus-master' || github.base_ref == 'quarkus-master'
run: |
echo '::set-env name=BRANCH_OPTIONS::-Poss-snapshots -Dquarkus.version=999-SNAPSHOT'
+ - name: Enable Camel 3.6.0 staging repo
+ if: github.ref == 'refs/heads/release/1.3.0'
+ run: |
+ echo '::set-env name=BRANCH_OPTIONS::-s '$(pwd)'/settings-camel-3.6.0.xml'
- name: Checkout
uses: actions/checkout@v2
- name: Set up JDK 11
@@ -196,6 +205,10 @@ jobs:
if: github.ref == 'refs/heads/quarkus-master' || github.base_ref == 'quarkus-master'
run: |
echo '::set-env name=BRANCH_OPTIONS::-Poss-snapshots -Dquarkus.version=999-SNAPSHOT'
+ - name: Enable Camel 3.6.0 staging repo
+ if: github.ref == 'refs/heads/release/1.3.0'
+ run: |
+ echo '::set-env name=BRANCH_OPTIONS::-s '$(pwd)'/settings-camel-3.6.0.xml'
- uses: actions/checkout@v2
- name: Set up JDK ${{ matrix.java }}
uses: AdoptOpenJDK/install-jdk@v1
@@ -249,6 +262,10 @@ jobs:
if: github.ref == 'refs/heads/quarkus-master' || github.base_ref == 'quarkus-master'
run: |
echo '::set-env name=BRANCH_OPTIONS::-Poss-snapshots -Dquarkus.version=999-SNAPSHOT'
+ - name: Enable Camel 3.6.0 staging repo
+ if: github.ref == 'refs/heads/release/1.3.0'
+ run: |
+ echo '::set-env name=BRANCH_OPTIONS::-s '$(pwd)'/settings-camel-3.6.0.xml'
- uses: actions/checkout@v2
- name: Set up JDK ${{ matrix.java }}
uses: AdoptOpenJDK/install-jdk@v1
@@ -291,6 +308,10 @@ jobs:
if: github.ref == 'refs/heads/quarkus-master' || github.base_ref == 'quarkus-master'
run: |
echo '::set-env name=BRANCH_OPTIONS::-Poss-snapshots -Dquarkus.version=999-SNAPSHOT'
+ - name: Enable Camel 3.6.0 staging repo
+ if: github.ref == 'refs/heads/release/1.3.0'
+ run: |
+ echo '::set-env name=BRANCH_OPTIONS::-s '$(pwd)'/settings-camel-3.6.0.xml'
- uses: actions/checkout@v2
- name: Set up JDK ${{ matrix.java }}
uses: AdoptOpenJDK/install-jdk@v1
@@ -331,6 +352,10 @@ jobs:
if: github.ref == 'refs/heads/quarkus-master' || github.base_ref == 'quarkus-master'
run: |
echo '::set-env name=BRANCH_OPTIONS::-Poss-snapshots -Dquarkus.version=999-SNAPSHOT'
+ - name: Enable Camel 3.6.0 staging repo
+ if: github.ref == 'refs/heads/release/1.3.0'
+ run: |
+ echo '::set-env name=BRANCH_OPTIONS::-s '$(pwd)'/settings-camel-3.6.0.xml'
- name: Activate native tests on Java 11
if: matrix.java == '11'
run: |
diff --git a/settings-camel-3.6.0.xml b/settings-camel-3.6.0.xml
new file mode 100644
index 0000000..eb284f9
--- /dev/null
+++ b/settings-camel-3.6.0.xml
@@ -0,0 +1,69 @@
+<?xml version="1.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.
+
+-->
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+ http://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+
+ <profiles>
+ <profile>
+ <id>camel-3.6.0-staging-repo</id>
+ <repositories>
+ <repository>
+ <id>camel-3.6.0</id>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </snapshots>
+ <url>https://repository.apache.org/content/repositories/orgapachecamel-1254</url>
+ <layout>default</layout>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>camel-3.6.0</id>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </snapshots>
+ <url>https://repository.apache.org/content/repositories/orgapachecamel-1254</url>
+ <layout>default</layout>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+
+ </profiles>
+ <activeProfiles>
+ <activeProfile>camel-3.6.0-staging-repo</activeProfile>
+ </activeProfiles>
+
+</settings>
[camel-quarkus] 02/02: HBase integration tests fail with Camel
3.6.0 Fix #1914
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch release/1.3.0
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 8f9336b2edfbcf9565b4c37dbccac40693db9f1f
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Fri Oct 16 19:32:19 2020 +0200
HBase integration tests fail with Camel 3.6.0 Fix #1914
---
extensions-jvm/hbase/integration-test/pom.xml | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/extensions-jvm/hbase/integration-test/pom.xml b/extensions-jvm/hbase/integration-test/pom.xml
index dba36d0..c01c9c2 100644
--- a/extensions-jvm/hbase/integration-test/pom.xml
+++ b/extensions-jvm/hbase/integration-test/pom.xml
@@ -52,6 +52,11 @@
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j-log4j12.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>20.0</version><!-- The last version that contains com.google.common.util.concurrent.Futures.addCallback(com.google.common.util.concurrent.ListenableFuture, com.google.common.util.concurrent.FutureCallback) required by hbase-test-util -->
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -89,6 +94,11 @@
<artifactId>hbase-testing-util</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -96,9 +106,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
</plugin>
<plugin>
<groupId>io.quarkus</groupId>