You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2020/03/06 11:37:34 UTC
[camel-quarkus] branch master updated: Upgrade to Quarkus 1.3.0.CR1
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new e24b071 Upgrade to Quarkus 1.3.0.CR1
e24b071 is described below
commit e24b071747ff04cb82cd707c033e6ac7a57f2b2b
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Mar 6 07:40:44 2020 +0000
Upgrade to Quarkus 1.3.0.CR1
---
extensions/infinispan/runtime/pom.xml | 4 ----
.../apache/camel/quarkus/component/http/it/HttpIT.java | 4 ++++
.../apache/camel/quarkus/component/http/it/HttpTest.java | 4 ++++
integration-tests/infinispan/pom.xml | 5 +++++
.../infinispan/InfinispanServerTestResource.java | 15 ---------------
.../quarkus/component/infinispan/InfinispanTest.java | 8 --------
pom.xml | 3 ++-
poms/bom/pom.xml | 5 +++++
8 files changed, 20 insertions(+), 28 deletions(-)
diff --git a/extensions/infinispan/runtime/pom.xml b/extensions/infinispan/runtime/pom.xml
index e106aea..2114a5e 100644
--- a/extensions/infinispan/runtime/pom.xml
+++ b/extensions/infinispan/runtime/pom.xml
@@ -70,10 +70,6 @@
<groupId>org.jboss.spec.javax.transaction</groupId>
<artifactId>jboss-transaction-api_1.2_spec</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.eclipse.microprofile.metrics</groupId>
- <artifactId>microprofile-metrics-api</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/integration-tests/http/src/test/java/org/apache/camel/quarkus/component/http/it/HttpIT.java b/integration-tests/http/src/test/java/org/apache/camel/quarkus/component/http/it/HttpIT.java
index 32704c9..b7a2a23 100644
--- a/integration-tests/http/src/test/java/org/apache/camel/quarkus/component/http/it/HttpIT.java
+++ b/integration-tests/http/src/test/java/org/apache/camel/quarkus/component/http/it/HttpIT.java
@@ -17,7 +17,11 @@
package org.apache.camel.quarkus.component.http.it;
import io.quarkus.test.junit.NativeImageTest;
+import org.junit.jupiter.api.condition.EnabledOnJre;
+import org.junit.jupiter.api.condition.JRE;
@NativeImageTest
+// TrustStoreResource does not work on Java 11: https://github.com/apache/camel-quarkus/issues/852
+@EnabledOnJre(JRE.JAVA_8)
class HttpIT extends HttpTest {
}
diff --git a/integration-tests/http/src/test/java/org/apache/camel/quarkus/component/http/it/HttpTest.java b/integration-tests/http/src/test/java/org/apache/camel/quarkus/component/http/it/HttpTest.java
index ab048c3..d2bbc04 100644
--- a/integration-tests/http/src/test/java/org/apache/camel/quarkus/component/http/it/HttpTest.java
+++ b/integration-tests/http/src/test/java/org/apache/camel/quarkus/component/http/it/HttpTest.java
@@ -21,6 +21,8 @@ import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import org.apache.camel.quarkus.test.TrustStoreResource;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledOnJre;
+import org.junit.jupiter.api.condition.JRE;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
@@ -30,6 +32,8 @@ import static org.hamcrest.Matchers.is;
@QuarkusTest
@QuarkusTestResource(HttpTestResource.class)
@QuarkusTestResource(TrustStoreResource.class)
+// TrustStoreResource does not work on Java 11: https://github.com/apache/camel-quarkus/issues/852
+@EnabledOnJre(JRE.JAVA_8)
class HttpTest {
@ParameterizedTest
@ValueSource(strings = { "ahc", "http", "netty-http" })
diff --git a/integration-tests/infinispan/pom.xml b/integration-tests/infinispan/pom.xml
index d20bd1a..e4f51fb 100644
--- a/integration-tests/infinispan/pom.xml
+++ b/integration-tests/infinispan/pom.xml
@@ -82,6 +82,11 @@
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
+ <artifactId>infinispan-component-annotations</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.infinispan</groupId>
<artifactId>infinispan-server-hotrod</artifactId>
<type>test-jar</type>
<scope>test</scope>
diff --git a/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanServerTestResource.java b/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanServerTestResource.java
index 949ff6a..ee2213e 100644
--- a/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanServerTestResource.java
+++ b/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanServerTestResource.java
@@ -30,7 +30,6 @@ import org.infinispan.test.fwk.TestResourceTracker;
public class InfinispanServerTestResource implements QuarkusTestResourceLifecycleManager {
private HotRodServer hotRodServer;
- private InfinispanTest camelTest;
@Override
public Map<String, String> start() {
@@ -46,21 +45,7 @@ public class InfinispanServerTestResource implements QuarkusTestResourceLifecycl
}
@Override
- public void inject(Object testInstance) {
- if (testInstance instanceof InfinispanTest) {
- this.camelTest = (InfinispanTest) testInstance;
- }
- }
-
- @Override
public void stop() {
- //
- // This is needed to properly stop the resources in the right order and
- // avoid spurious exceptions shown in the logs.
- //
- if (camelTest != null && camelTest.cacheManager != null) {
- camelTest.cacheManager.stop();
- }
if (hotRodServer != null) {
hotRodServer.stop();
}
diff --git a/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanTest.java b/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanTest.java
index 59d05e2..20a103d 100644
--- a/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanTest.java
+++ b/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanTest.java
@@ -16,13 +16,9 @@
*/
package org.apache.camel.quarkus.component.infinispan;
-import javax.inject.Inject;
-
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
-import org.apache.camel.quarkus.core.CamelMain;
-import org.infinispan.client.hotrod.RemoteCacheManager;
import org.junit.jupiter.api.Test;
import static org.hamcrest.Matchers.is;
@@ -30,10 +26,6 @@ import static org.hamcrest.Matchers.is;
@QuarkusTest
@QuarkusTestResource(InfinispanServerTestResource.class)
public class InfinispanTest {
- @Inject
- CamelMain main;
- @Inject
- RemoteCacheManager cacheManager;
@Test
public void testInfinispan() {
diff --git a/pom.xml b/pom.xml
index 9013464..a439b25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,9 +42,10 @@
<ahc.version>2.10.4</ahc.version>
<camel.version>3.1.0</camel.version>
+ <google-http-client.version>1.22.0</google-http-client.version>
<guava.version>26.0-jre</guava.version>
<hapi.version>4.1.0</hapi.version>
- <quarkus.version>1.3.0.Alpha2</quarkus.version>
+ <quarkus.version>1.3.0.CR1</quarkus.version>
<httpmime.version>4.1.3</httpmime.version>
<jackson.version>2.10.2</jackson.version>
<jetty.version>9.4.18.v20190429</jetty.version>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 6893459..27a1858 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -1207,6 +1207,11 @@
<version>${jackson.version}</version>
</dependency>
<dependency>
+ <groupId>com.google.http-client</groupId>
+ <artifactId>google-http-client</artifactId>
+ <version>${google-http-client.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>