This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 3444a0fa2d391c07ef2e6d2eb9f0715e2430bc39
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Mon Jul 6 12:26:55 2020 +0100
Upgrade to Quarkus 1.7.0 - WIP
---
extensions/avro/deployment/pom.xml | 4 ++++
extensions/avro/runtime/pom.xml | 4 ++++
extensions/elasticsearch-rest/deployment/pom.xml | 4 ++++
extensions/elasticsearch-rest/runtime/pom.xml | 4 ++--
.../component/elasticsearch/rest/it/ElasticSearchTestResource.java | 4 ++--
pom.xml | 3 +--
poms/bom/pom.xml | 5 -----
7 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/extensions/avro/deployment/pom.xml
b/extensions/avro/deployment/pom.xml
index 6194192..048d4ea 100644
--- a/extensions/avro/deployment/pom.xml
+++ b/extensions/avro/deployment/pom.xml
@@ -31,6 +31,10 @@
<dependencies>
<dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-avro-deployment</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-core-deployment</artifactId>
</dependency>
diff --git a/extensions/avro/runtime/pom.xml b/extensions/avro/runtime/pom.xml
index 3825e0b..78f9469 100644
--- a/extensions/avro/runtime/pom.xml
+++ b/extensions/avro/runtime/pom.xml
@@ -47,6 +47,10 @@
<dependencies>
<dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-avro</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-core</artifactId>
</dependency>
diff --git a/extensions/elasticsearch-rest/deployment/pom.xml
b/extensions/elasticsearch-rest/deployment/pom.xml
index c576986..6c712b7 100644
--- a/extensions/elasticsearch-rest/deployment/pom.xml
+++ b/extensions/elasticsearch-rest/deployment/pom.xml
@@ -35,6 +35,10 @@
<artifactId>quarkus-elasticsearch-rest-client-deployment</artifactId>
</dependency>
<dependency>
+ <groupId>io.quarkus</groupId>
+
<artifactId>quarkus-elasticsearch-rest-high-level-client-deployment</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-core-deployment</artifactId>
</dependency>
diff --git a/extensions/elasticsearch-rest/runtime/pom.xml
b/extensions/elasticsearch-rest/runtime/pom.xml
index 5c9ff99..a66ff41 100644
--- a/extensions/elasticsearch-rest/runtime/pom.xml
+++ b/extensions/elasticsearch-rest/runtime/pom.xml
@@ -51,8 +51,8 @@
<artifactId>quarkus-elasticsearch-rest-client</artifactId>
</dependency>
<dependency>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>elasticsearch-rest-high-level-client</artifactId>
+ <groupId>io.quarkus</groupId>
+
<artifactId>quarkus-elasticsearch-rest-high-level-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git
a/integration-tests/elasticsearch-rest/src/test/java/org/apache/camel/quarkus/component/elasticsearch/rest/it/ElasticSearchTestResource.java
b/integration-tests/elasticsearch-rest/src/test/java/org/apache/camel/quarkus/component/elasticsearch/rest/it/ElasticSearchTestResource.java
index e2b42ee..763b5ba 100644
---
a/integration-tests/elasticsearch-rest/src/test/java/org/apache/camel/quarkus/component/elasticsearch/rest/it/ElasticSearchTestResource.java
+++
b/integration-tests/elasticsearch-rest/src/test/java/org/apache/camel/quarkus/component/elasticsearch/rest/it/ElasticSearchTestResource.java
@@ -30,7 +30,7 @@ import org.testcontainers.utility.TestcontainersConfiguration;
public class ElasticSearchTestResource implements
QuarkusTestResourceLifecycleManager {
private static final Logger LOGGER =
LoggerFactory.getLogger(ElasticSearchTestResource.class);
- private static final String ELASTICSEARCH_IMAGE = "elasticsearch:7.6.1";
+ private static final String ELASTICSEARCH_IMAGE = "elasticsearch:7.7.0";
private static final int ELASTICSEARCH_PORT = 9200;
private GenericContainer container;
@@ -49,7 +49,7 @@ public class ElasticSearchTestResource implements
QuarkusTestResourceLifecycleMa
container.start();
return CollectionHelper.mapOf(
- "camel.component.elasticsearch-rest.host-addresses",
+ "quarkus.elasticsearch.hosts",
String.format("localhost:%s",
container.getMappedPort(ELASTICSEARCH_PORT)));
} catch (Exception e) {
diff --git a/pom.xml b/pom.xml
index 6b24360..32019fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,6 @@
<awssdk2.version>2.13.33</awssdk2.version>
<camel.version>3.4.2</camel.version>
<debezium.version>1.2.0.Final</debezium.version>
- <elasticsearch.version>7.6.1</elasticsearch.version>
<freemarker.version>2.3.30</freemarker.version>
<github-api.version>1.111</github-api.version>
<google-http-client.version>1.22.0</google-http-client.version>
@@ -67,7 +66,7 @@
<kotlin.version>1.3.72</kotlin.version>
<okhttp.version>3.14.6</okhttp.version><!-- keep in sync with okio -->
<okio.version>1.17.2</okio.version><!-- keep in sync with okhttp -->
- <quarkus.version>1.6.1.Final</quarkus.version>
+ <quarkus.version>999-SNAPSHOT</quarkus.version>
<quarkus-qpid-jms.version>0.16.0</quarkus-qpid-jms.version>
<protobuf.version>3.11.1</protobuf.version>
<retrofit.version>2.5.0</retrofit.version>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index b03c9b3..ff125e1 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -3241,11 +3241,6 @@
<version>${stax2.version}</version>
</dependency>
<dependency>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>elasticsearch-rest-high-level-client</artifactId>
- <version>${elasticsearch.version}</version>
- </dependency>
- <dependency>
<groupId>org.influxdb</groupId>
<artifactId>influxdb-java</artifactId>
<version>${influxdb.version}</version>
