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 21:10:24 UTC
[camel-quarkus] branch release/1.3.0 updated (8f9336b -> 0f246b2)
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 8f9336b HBase integration tests fail with Camel 3.6.0 Fix #1914
discard 494e006 Enable Camel 3.6.0 staging repository temporarily
discard 9776595 Improve the camel-bean extension by not using an alias for BeanAnnotationExpressionFactory #1725
discard 0f081d9 Remove workaround for CAMEL-15518 #1769
discard 398dd51 Remove HipChat after it was removed from Camel 3.6.0
new 3db1bb3 Remove HipChat after it was removed from Camel 3.6.0
new 8349c6e Remove workaround for CAMEL-15518 #1769
new 96f1c0a Improve the camel-bean extension by not using an alias for BeanAnnotationExpressionFactory #1725
new 13c89fb Enable Camel 3.6.0 staging repository temporarily
new 0f246b2 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 (8f9336b)
\
N -- N -- N refs/heads/release/1.3.0 (0f246b2)
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 5 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:
docs/modules/ROOT/nav.adoc | 1 -
1 file changed, 1 deletion(-)
[camel-quarkus] 03/05: Improve the camel-bean extension by not
using an alias for BeanAnnotationExpressionFactory #1725
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 96f1c0acee7d1ebd6ee344993a2b57ebe7abd77e
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Fri Oct 16 17:40:55 2020 +0200
Improve the camel-bean extension by not using an alias for BeanAnnotationExpressionFactory #1725
---
.../Target_BeanAnnotationExpressionFactory.java | 52 ----------------------
1 file changed, 52 deletions(-)
diff --git a/extensions/bean/runtime/src/main/java/org/apache/camel/quarkus/bean/Target_BeanAnnotationExpressionFactory.java b/extensions/bean/runtime/src/main/java/org/apache/camel/quarkus/bean/Target_BeanAnnotationExpressionFactory.java
deleted file mode 100644
index 0e0075e..0000000
--- a/extensions/bean/runtime/src/main/java/org/apache/camel/quarkus/bean/Target_BeanAnnotationExpressionFactory.java
+++ /dev/null
@@ -1,52 +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.
- */
-package org.apache.camel.quarkus.bean;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-
-import com.oracle.svm.core.annotate.Substitute;
-import com.oracle.svm.core.annotate.TargetClass;
-import org.apache.camel.component.bean.BeanAnnotationExpressionFactory;
-import org.apache.camel.support.ObjectHelper;
-
-/**
- * This alias works around an issue with the bean annotation from camel. In
- * camel, BeanAnnotationExpressionFactory.getFromAnnotation(...) uses the
- * underlying annotation class proxy which is a JVM implementation detail. So,
- * this alias makes it possible to get the bean annotation value in native
- * mode.
- */
-@TargetClass(BeanAnnotationExpressionFactory.class)
-public final class Target_BeanAnnotationExpressionFactory {
- @Substitute
- protected String getFromAnnotation(Annotation annotation, String attribute) {
- try {
- Method method = annotation.annotationType().getDeclaredMethod(attribute);
- Object value = ObjectHelper.invokeMethod(method, annotation);
- if (value == null) {
- throw new IllegalArgumentException("Cannot determine the " + attribute + " from the annotation: " + annotation);
- }
- return value.toString();
- } catch (NoSuchMethodException e) {
- throw new IllegalArgumentException(
- "Cannot determine the " + attribute
- + " of the annotation: " + annotation + " as it does not have a " + attribute
- + "() method");
- }
- }
-}
[camel-quarkus] 04/05: 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 13c89fbff2d6147db057b91a0bdad8b73e3319dc
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/05: Remove workaround for CAMEL-15518 #1769
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 8349c6e2b33049695ff8de254029514a861efc06
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Fri Oct 16 17:36:43 2020 +0200
Remove workaround for CAMEL-15518 #1769
---
.../quarkus/core/deployment/CamelRegistryProcessor.java | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRegistryProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRegistryProcessor.java
index d2b43f5..8ffbd52 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRegistryProcessor.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRegistryProcessor.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.quarkus.core.deployment;
-import java.util.Arrays;
import java.util.List;
import io.quarkus.deployment.annotations.BuildStep;
@@ -49,21 +48,6 @@ public class CamelRegistryProcessor {
return new CamelRegistryBuildItem(recorder.createRegistry());
}
- /*
- * TODO: this is a workaround for https://github.com/apache/camel-quarkus/issues/1765
- * remove it after https://issues.apache.org/jira/browse/CAMEL-15518
- */
- @BuildStep
- List<CamelBeanBuildItem> contextConfigurer() {
- return Arrays.asList(
- new CamelBeanBuildItem(
- "org.apache.camel.ExtendedCamelContext",
- "org.apache.camel.impl.ExtendedCamelContextConfigurer"),
- new CamelBeanBuildItem(
- "org.apache.camel.impl.ExtendedCamelContext",
- "org.apache.camel.impl.ExtendedCamelContextConfigurer"));
- }
-
@Record(ExecutionTime.STATIC_INIT)
@BuildStep
public void bindBeansToRegistry(
[camel-quarkus] 01/05: Remove HipChat after it was removed from
Camel 3.6.0
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 3db1bb3c5aec06a82ff3d4115aeae734bce348e8
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Fri Oct 16 17:32:28 2020 +0200
Remove HipChat after it was removed from Camel 3.6.0
---
catalog/pom.xml | 13 ---
docs/modules/ROOT/nav.adoc | 1 -
.../ROOT/pages/reference/extensions/hipchat.adoc | 33 --------
.../partials/reference/components/hipchat.adoc | 13 ---
extensions-jvm/hipchat/deployment/pom.xml | 61 --------------
.../hipchat/deployment/HipchatProcessor.java | 46 -----------
extensions-jvm/hipchat/integration-test/pom.xml | 93 ----------------------
.../component/hipchat/it/HipchatResource.java | 51 ------------
.../quarkus/component/hipchat/it/HipchatTest.java | 34 --------
extensions-jvm/hipchat/pom.xml | 38 ---------
extensions-jvm/hipchat/runtime/pom.xml | 92 ---------------------
.../main/resources/META-INF/quarkus-extension.yaml | 32 --------
extensions-jvm/pom.xml | 1 -
poms/bom/pom.xml | 15 ----
14 files changed, 523 deletions(-)
diff --git a/catalog/pom.xml b/catalog/pom.xml
index c7bd10d..1c2de32 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -1765,19 +1765,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-hipchat</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-hl7</artifactId>
<version>${project.version}</version>
<type>pom</type>
diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
index 8fc25db..7c12ee4 100644
--- a/docs/modules/ROOT/nav.adoc
+++ b/docs/modules/ROOT/nav.adoc
@@ -142,7 +142,6 @@
*** xref:reference/extensions/guava-eventbus.adoc[Guava EventBus]
*** xref:reference/extensions/hazelcast.adoc[Hazelcast Atomic Number]
*** xref:reference/extensions/hdfs.adoc[HDFS]
-*** xref:reference/extensions/hipchat.adoc[Hipchat]
*** xref:reference/extensions/hl7.adoc[HL7]
*** xref:reference/extensions/http.adoc[HTTP]
*** xref:reference/extensions/hystrix.adoc[Hystrix]
diff --git a/docs/modules/ROOT/pages/reference/extensions/hipchat.adoc b/docs/modules/ROOT/pages/reference/extensions/hipchat.adoc
deleted file mode 100644
index 74dd0e7..0000000
--- a/docs/modules/ROOT/pages/reference/extensions/hipchat.adoc
+++ /dev/null
@@ -1,33 +0,0 @@
-// Do not edit directly!
-// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page
-= Hipchat
-:cq-artifact-id: camel-quarkus-hipchat
-:cq-native-supported: false
-:cq-status: Preview
-:cq-description: Send and receive messages to/from Hipchat service.
-:cq-deprecated: false
-:cq-jvm-since: 1.1.0
-:cq-native-since: n/a
-
-[.badges]
-[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported##
-
-Send and receive messages to/from Hipchat service.
-
-== What's inside
-
-* https://camel.apache.org/components/latest/hipchat-component.html[Hipchat component], URI syntax: `hipchat:protocol:host:port`
-
-Please refer to the above link for usage and configuration details.
-
-== Maven coordinates
-
-[source,xml]
-----
-<dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-hipchat</artifactId>
-</dependency>
-----
-
-Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications.
diff --git a/docs/modules/ROOT/partials/reference/components/hipchat.adoc b/docs/modules/ROOT/partials/reference/components/hipchat.adoc
deleted file mode 100644
index 9f3bf61..0000000
--- a/docs/modules/ROOT/partials/reference/components/hipchat.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-// Do not edit directly!
-// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page
-:cq-artifact-id: camel-quarkus-hipchat
-:cq-artifact-id-base: hipchat
-:cq-native-supported: false
-:cq-status: Preview
-:cq-deprecated: false
-:cq-jvm-since: 1.1.0
-:cq-native-since: n/a
-:cq-camel-part-name: hipchat
-:cq-camel-part-title: Hipchat
-:cq-camel-part-description: Send and receive messages to/from Hipchat service.
-:cq-extension-page-title: Hipchat
diff --git a/extensions-jvm/hipchat/deployment/pom.xml b/extensions-jvm/hipchat/deployment/pom.xml
deleted file mode 100644
index ca0e24c..0000000
--- a/extensions-jvm/hipchat/deployment/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-hipchat-parent</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>camel-quarkus-hipchat-deployment</artifactId>
- <name>Camel Quarkus :: Hipchat :: Deployment</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-core-deployment</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-hipchat</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <annotationProcessorPaths>
- <path>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-extension-processor</artifactId>
- <version>${quarkus.version}</version>
- </path>
- </annotationProcessorPaths>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/extensions-jvm/hipchat/deployment/src/main/java/org/apache/camel/quarkus/component/hipchat/deployment/HipchatProcessor.java b/extensions-jvm/hipchat/deployment/src/main/java/org/apache/camel/quarkus/component/hipchat/deployment/HipchatProcessor.java
deleted file mode 100644
index 37dead8..0000000
--- a/extensions-jvm/hipchat/deployment/src/main/java/org/apache/camel/quarkus/component/hipchat/deployment/HipchatProcessor.java
+++ /dev/null
@@ -1,46 +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.
- */
-package org.apache.camel.quarkus.component.hipchat.deployment;
-
-import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Record;
-import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.pkg.steps.NativeBuild;
-import org.apache.camel.quarkus.core.JvmOnlyRecorder;
-import org.jboss.logging.Logger;
-
-class HipchatProcessor {
-
- private static final Logger LOG = Logger.getLogger(HipchatProcessor.class);
- private static final String FEATURE = "camel-hipchat";
-
- @BuildStep
- FeatureBuildItem feature() {
- return new FeatureBuildItem(FEATURE);
- }
-
- /**
- * Remove this once this extension starts supporting the native mode.
- */
- @BuildStep(onlyIf = NativeBuild.class)
- @Record(value = ExecutionTime.RUNTIME_INIT)
- void warnJvmInNative(JvmOnlyRecorder recorder) {
- JvmOnlyRecorder.warnJvmInNative(LOG, FEATURE); // warn at build time
- recorder.warnJvmInNative(FEATURE); // warn at runtime
- }
-}
diff --git a/extensions-jvm/hipchat/integration-test/pom.xml b/extensions-jvm/hipchat/integration-test/pom.xml
deleted file mode 100644
index ed5406a..0000000
--- a/extensions-jvm/hipchat/integration-test/pom.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-build-parent-it</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- <relativePath>../../../poms/build-parent-it/pom.xml</relativePath>
- </parent>
-
- <artifactId>camel-quarkus-hipchat-integration-test</artifactId>
- <name>Camel Quarkus :: Hipchat :: Integration Test</name>
- <description>Integration tests for Camel Quarkus Hipchat extension</description>
-
- <properties>
- <!-- mvnd, a.k.a. Maven Daemon: https://github.com/mvndaemon/mvnd -->
- <!-- The following rule tells mvnd to build the listed deployment modules before this module. -->
- <!-- This is important because mvnd builds modules in parallel by default. The deployment modules are not -->
- <!-- explicit dependencies of this module in the Maven sense, although they are required by the Quarkus Maven plugin. -->
- <!-- Please update the rule whenever you change the dependencies of this module by running -->
- <!-- mvn process-resources -Pformat from the root directory -->
- <mvnd.builder.rule>camel-quarkus-hipchat-deployment,camel-quarkus-support-policy-deployment</mvnd.builder.rule>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-bom-test</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-hipchat</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
- </dependency>
-
- <!-- test dependencies -->
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-junit5</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>io.rest-assured</groupId>
- <artifactId>rest-assured</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/extensions-jvm/hipchat/integration-test/src/main/java/org/apache/camel/quarkus/component/hipchat/it/HipchatResource.java b/extensions-jvm/hipchat/integration-test/src/main/java/org/apache/camel/quarkus/component/hipchat/it/HipchatResource.java
deleted file mode 100644
index 5175eb1..0000000
--- a/extensions-jvm/hipchat/integration-test/src/main/java/org/apache/camel/quarkus/component/hipchat/it/HipchatResource.java
+++ /dev/null
@@ -1,51 +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.
- */
-package org.apache.camel.quarkus.component.hipchat.it;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.apache.camel.CamelContext;
-import org.jboss.logging.Logger;
-
-@Path("/hipchat")
-@ApplicationScoped
-public class HipchatResource {
-
- private static final Logger LOG = Logger.getLogger(HipchatResource.class);
-
- private static final String COMPONENT_HIPCHAT = "hipchat";
- @Inject
- CamelContext context;
-
- @Path("/load/component/hipchat")
- @GET
- @Produces(MediaType.TEXT_PLAIN)
- public Response loadComponentHipchat() throws Exception {
- /* This is an autogenerated test */
- if (context.getComponent(COMPONENT_HIPCHAT) != null) {
- return Response.ok().build();
- }
- LOG.warnf("Could not load [%s] from the Camel context", COMPONENT_HIPCHAT);
- return Response.status(500, COMPONENT_HIPCHAT + " could not be loaded from the Camel context").build();
- }
-}
diff --git a/extensions-jvm/hipchat/integration-test/src/test/java/org/apache/camel/quarkus/component/hipchat/it/HipchatTest.java b/extensions-jvm/hipchat/integration-test/src/test/java/org/apache/camel/quarkus/component/hipchat/it/HipchatTest.java
deleted file mode 100644
index 52a4a14..0000000
--- a/extensions-jvm/hipchat/integration-test/src/test/java/org/apache/camel/quarkus/component/hipchat/it/HipchatTest.java
+++ /dev/null
@@ -1,34 +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.
- */
-package org.apache.camel.quarkus.component.hipchat.it;
-
-import io.quarkus.test.junit.QuarkusTest;
-import io.restassured.RestAssured;
-import org.junit.jupiter.api.Test;
-
-@QuarkusTest
-class HipchatTest {
-
- @Test
- public void loadComponentHipchat() {
- /* A simple autogenerated test */
- RestAssured.get("/hipchat/load/component/hipchat")
- .then()
- .statusCode(200);
- }
-
-}
diff --git a/extensions-jvm/hipchat/pom.xml b/extensions-jvm/hipchat/pom.xml
deleted file mode 100644
index 7e272be..0000000
--- a/extensions-jvm/hipchat/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-build-parent</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- <relativePath>../../poms/build-parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>camel-quarkus-hipchat-parent</artifactId>
- <name>Camel Quarkus :: Hipchat</name>
- <packaging>pom</packaging>
-
- <modules>
- <module>deployment</module>
- <module>runtime</module>
- <module>integration-test</module>
- </modules>
-</project>
diff --git a/extensions-jvm/hipchat/runtime/pom.xml b/extensions-jvm/hipchat/runtime/pom.xml
deleted file mode 100644
index 22585ee..0000000
--- a/extensions-jvm/hipchat/runtime/pom.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-hipchat-parent</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>camel-quarkus-hipchat</artifactId>
- <name>Camel Quarkus :: Hipchat :: Runtime</name>
- <description>Send and receive messages to/from Hipchat service.</description>
-
- <properties>
- <camel.quarkus.jvmSince>1.1.0</camel.quarkus.jvmSince>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-bom</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-hipchat</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>update-extension-doc-page</id>
- <goals><goal>update-extension-doc-page</goal></goals>
- <phase>process-classes</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <annotationProcessorPaths>
- <path>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-extension-processor</artifactId>
- <version>${quarkus.version}</version>
- </path>
- </annotationProcessorPaths>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/extensions-jvm/hipchat/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-jvm/hipchat/runtime/src/main/resources/META-INF/quarkus-extension.yaml
deleted file mode 100644
index 8b9131a..0000000
--- a/extensions-jvm/hipchat/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ /dev/null
@@ -1,32 +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.
-#
-
-# This is a generated file. Do not edit directly!
-# To re-generate, run the following command from the top level directory:
-#
-# mvn -N cq:update-quarkus-metadata
-#
----
-name: "Camel Hipchat"
-description: "Send and receive messages to/from Hipchat service"
-metadata:
- unlisted: true
- guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/hipchat.html"
- categories:
- - "integration"
- status:
- - "preview"
diff --git a/extensions-jvm/pom.xml b/extensions-jvm/pom.xml
index bc1d636..1d8762c 100644
--- a/extensions-jvm/pom.xml
+++ b/extensions-jvm/pom.xml
@@ -78,7 +78,6 @@
<module>hazelcast</module>
<module>hbase</module>
<module>hdfs</module>
- <module>hipchat</module>
<module>hl7</module>
<module>iec60870</module>
<module>ignite</module>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index cc8c87d..5299b09 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -983,11 +983,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-hipchat</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-hl7</artifactId>
<version>${camel.version}</version>
</dependency>
@@ -3337,16 +3332,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-hipchat</artifactId>
- <version>${camel-quarkus.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-hipchat-deployment</artifactId>
- <version>${camel-quarkus.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-hl7</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
[camel-quarkus] 05/05: 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 0f246b2ed6ae3f95da6abf1ea42eff55ab2aa5dc
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>