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 15:04:23 UTC
[camel-quarkus] branch master updated (79b58b6 -> 80bc1f2)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
from 79b58b6 add camel-jaxb into extensions
new 298f609 Camel MongoDB extension does not register camelMongoClient bean
new 0d331f4 Remove redundant ServiceProviderBuildItem from WebSocketJSR356Processor
new 80bc1f2 Downgrade manven-surefire-plugin to 2.22.2
The 3 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:
.../component/servlet/test/CustomDefaultServletClassTest.java | 2 ++
.../quarkus/component/servlet/test/NoDefaultServletTest.java | 2 ++
.../websocket/jsr356/deployment/WebSocketJSR356Processor.java | 11 -----------
.../camel/quarkus/component/mongodb/it/MongoDbResource.java | 10 ----------
pom.xml | 3 ++-
5 files changed, 6 insertions(+), 22 deletions(-)
[camel-quarkus] 02/03: Remove redundant ServiceProviderBuildItem
from WebSocketJSR356Processor
Posted by ja...@apache.org.
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
commit 0d331f4d77876e0ee319e2f0f8640d5442150784
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Mar 6 11:52:53 2020 +0000
Remove redundant ServiceProviderBuildItem from WebSocketJSR356Processor
---
.../websocket/jsr356/deployment/WebSocketJSR356Processor.java | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/extensions/websocket-jsr356/deployment/src/main/java/org/apache/camel/quarkus/component/websocket/jsr356/deployment/WebSocketJSR356Processor.java b/extensions/websocket-jsr356/deployment/src/main/java/org/apache/camel/quarkus/component/websocket/jsr356/deployment/WebSocketJSR356Processor.java
index fe89823..46c4bd3 100644
--- a/extensions/websocket-jsr356/deployment/src/main/java/org/apache/camel/quarkus/component/websocket/jsr356/deployment/WebSocketJSR356Processor.java
+++ b/extensions/websocket-jsr356/deployment/src/main/java/org/apache/camel/quarkus/component/websocket/jsr356/deployment/WebSocketJSR356Processor.java
@@ -18,16 +18,12 @@ package org.apache.camel.quarkus.component.websocket.jsr356.deployment;
import java.util.List;
-import javax.websocket.server.ServerEndpointConfig;
-
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.builditem.nativeimage.ServiceProviderBuildItem;
import io.quarkus.undertow.deployment.ServletContextAttributeBuildItem;
import io.quarkus.undertow.deployment.ServletDeploymentManagerBuildItem;
-import io.undertow.websockets.jsr.DefaultContainerConfigurator;
import io.undertow.websockets.jsr.WebSocketDeploymentInfo;
import org.apache.camel.quarkus.component.websocket.jsr356.CamelWebSocketJSR356Config;
import org.apache.camel.quarkus.component.websocket.jsr356.CamelWebSocketJSR356Recorder;
@@ -46,13 +42,6 @@ class WebSocketJSR356Processor {
}
@BuildStep
- ServiceProviderBuildItem registerConfiguratorServiceProvider() {
- // TODO: Remove this. See https://github.com/quarkusio/quarkus/issues/7509
- return new ServiceProviderBuildItem(ServerEndpointConfig.Configurator.class.getName(),
- DefaultContainerConfigurator.class.getName());
- }
-
- @BuildStep
CamelServiceFilterBuildItem serviceFilter() {
return new CamelServiceFilterBuildItem(CamelServiceFilter.forComponent("websocket-jsr356"));
}
[camel-quarkus] 03/03: Downgrade manven-surefire-plugin to 2.22.2
Posted by ja...@apache.org.
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
commit 80bc1f2a10a74e302b12a6fe82599492f24deabc
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Mar 6 12:22:11 2020 +0000
Downgrade manven-surefire-plugin to 2.22.2
---
.../quarkus/component/servlet/test/CustomDefaultServletClassTest.java | 2 ++
.../camel/quarkus/component/servlet/test/NoDefaultServletTest.java | 2 ++
pom.xml | 3 ++-
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/CustomDefaultServletClassTest.java b/extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/CustomDefaultServletClassTest.java
index acacaaa..14733d5 100644
--- a/extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/CustomDefaultServletClassTest.java
+++ b/extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/CustomDefaultServletClassTest.java
@@ -29,9 +29,11 @@ import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.Asset;
import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
+@Disabled("https://github.com/apache/camel-quarkus/issues/854")
public class CustomDefaultServletClassTest {
@RegisterExtension
static final QuarkusUnitTest CONFIG = new QuarkusUnitTest()
diff --git a/extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/NoDefaultServletTest.java b/extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/NoDefaultServletTest.java
index d529130..08072fc 100644
--- a/extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/NoDefaultServletTest.java
+++ b/extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/NoDefaultServletTest.java
@@ -29,9 +29,11 @@ import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.Asset;
import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
+@Disabled("https://github.com/apache/camel-quarkus/issues/853")
public class NoDefaultServletTest {
@RegisterExtension
static final QuarkusUnitTest CONFIG = new QuarkusUnitTest()
diff --git a/pom.xml b/pom.xml
index a439b25..8dff9fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,8 @@
<maven-source-plugin.version>3.1.0</maven-source-plugin.version>
<maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
- <maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
+ <!-- NOTE: We pin to this version due to https://github.com/apache/camel-quarkus/issues/723 -->
+ <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
<!-- maven-release-plugin -->
<tagNameFormat>@{project.version}</tagNameFormat>
[camel-quarkus] 01/03: Camel MongoDB extension does not register
camelMongoClient bean
Posted by ja...@apache.org.
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
commit 298f609180532c3f0e30819be926b716ef34b038
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Mar 6 11:49:44 2020 +0000
Camel MongoDB extension does not register camelMongoClient bean
Fixes #747
---
.../camel/quarkus/component/mongodb/it/MongoDbResource.java | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/integration-tests/mongodb/src/main/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbResource.java b/integration-tests/mongodb/src/main/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbResource.java
index 4e11a93..c859969 100644
--- a/integration-tests/mongodb/src/main/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbResource.java
+++ b/integration-tests/mongodb/src/main/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbResource.java
@@ -19,7 +19,6 @@ package org.apache.camel.quarkus.component.mongodb.it;
import java.net.URI;
import java.net.URISyntaxException;
-import javax.annotation.PostConstruct;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.json.Json;
@@ -35,7 +34,6 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoCursor;
import com.mongodb.client.MongoIterable;
import org.apache.camel.ProducerTemplate;
@@ -47,14 +45,6 @@ public class MongoDbResource {
@Inject
ProducerTemplate producerTemplate;
- @Inject
- MongoClient client;
-
- @PostConstruct
- public void init() {
- producerTemplate.getCamelContext().getRegistry().bind("camelMongoClient", client);
- }
-
@POST
@Path("/collection/{collectionName}")
@Consumes(MediaType.APPLICATION_JSON)