Upgrade to Quarkus 1.3.0.CR1

apache · Mar 6, 2020 · e24b071 · e24b071
1 parent 0ee6af8
commit e24b071
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 28 deletions.
diff --git 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
@@ -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/...gration-tests/http/src/test/java/org/apache/camel/quarkus/component/http/it/HttpTest.java b/...gration-tests/http/src/test/java/org/apache/camel/quarkus/component/http/it/HttpTest.java
@@ -21,6 +21,8 @@
 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 @@
 @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
@@ -80,6 +80,11 @@
                 </exclusion>
             </exclusions>
         </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>

diff --git a/...test/java/org/apache/camel/quarkus/component/infinispan/InfinispanServerTestResource.java b/...test/java/org/apache/camel/quarkus/component/infinispan/InfinispanServerTestResource.java
@@ -30,7 +30,6 @@
 
 public class InfinispanServerTestResource implements QuarkusTestResourceLifecycleManager {
     private HotRodServer hotRodServer;
-    private InfinispanTest camelTest;
 
     @Override
     public Map<String, String> start() {
@@ -45,22 +44,8 @@ public Map<String, String> start() {
         return Collections.emptyMap();
     }
 
-    @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/...nfinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanTest.java b/...nfinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanTest.java
@@ -16,24 +16,16 @@
  */
 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;
 
 @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
@@ -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
@@ -1206,6 +1206,11 @@
                 <artifactId>jackson-dataformat-xml</artifactId>
                 <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>