[camel] branch master updated: Upgrade AWS SDK v2 to version 2.10.79
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 465bdf0 Upgrade AWS SDK v2 to version 2.10.79 465bdf0 is described below commit 465bdf0b33452c411788bb03b76db32e09d651c2 Author: Andrea Cosentino AuthorDate: Thu Mar 5 07:58:48 2020 +0100 Upgrade AWS SDK v2 to version 2.10.79 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 1bfc2a9..7d5abf8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -88,7 +88,7 @@ 4.0.2 1.11.714_1 1.11.714 -2.10.78 +2.10.79 1.11.22 2.4.0 1.2.14
[camel] 03/03: Fixed test
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit f44b207ba2665ff32341c3e3551e166ed378fae2 Author: Claus Ibsen AuthorDate: Thu Mar 5 07:49:40 2020 +0100 Fixed test --- components/camel-osgi-activator/pom.xml | 4 components/camel-osgi-activator/src/assembly/test-bundles.xml | 2 +- .../org/apache/camel/component/osgi/activator/PaxExamOptions.java | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/components/camel-osgi-activator/pom.xml b/components/camel-osgi-activator/pom.xml index 635c501..6c81feb 100644 --- a/components/camel-osgi-activator/pom.xml +++ b/components/camel-osgi-activator/pom.xml @@ -56,6 +56,10 @@ org.apache.camel camel-core-osgi + +org.apache.camel +camel-core-languages + org.apache.camel diff --git a/components/camel-osgi-activator/src/assembly/test-bundles.xml b/components/camel-osgi-activator/src/assembly/test-bundles.xml index c64ae38..a7798e9 100644 --- a/components/camel-osgi-activator/src/assembly/test-bundles.xml +++ b/components/camel-osgi-activator/src/assembly/test-bundles.xml @@ -34,11 +34,11 @@ org.apache.camel:camel-base org.apache.camel:camel-core-engine org.apache.camel:camel-core-osgi +org.apache.camel:camel-core-languages org.apache.camel:camel-management-api org.apache.camel:camel-osgi-activator org.apache.camel:camel-support org.apache.camel:camel-util - org.apache.camel:camel-timer org.apache.camel:camel-log diff --git a/components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/PaxExamOptions.java b/components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/PaxExamOptions.java index 709476e..38f3a8e 100644 --- a/components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/PaxExamOptions.java +++ b/components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/PaxExamOptions.java @@ -63,6 +63,7 @@ public enum PaxExamOptions { ), CAMEL_CORE_OSGI( createStreamBundleOption("camel-core-engine.jar"), +createStreamBundleOption("camel-core-languages.jar"), createStreamBundleOption("camel-api.jar"), createStreamBundleOption("camel-base.jar"), createStreamBundleOption("camel-management-api.jar"),
[camel] 01/03: Fixed test
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 3ebce43e5616817c0c5d0707c7c4d70c0b8e250d Author: Claus Ibsen AuthorDate: Thu Mar 5 07:40:58 2020 +0100 Fixed test --- components/camel-kura/pom.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/components/camel-kura/pom.xml b/components/camel-kura/pom.xml index ebdf97d..c23df0e 100644 --- a/components/camel-kura/pom.xml +++ b/components/camel-kura/pom.xml @@ -87,6 +87,11 @@ org.apache.camel +camel-test +test + + +org.apache.camel camel-xml-jaxb test
[camel] branch master updated (68742b3 -> f44b207)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 68742b3 Camel-AWS2-ECS: Fixed CS new 3ebce43 Fixed test new 26168a3 Fixed tests new f44b207 Fixed test 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: .../java/org/apache/camel/component/jt400/Jt400EndpointTest.java | 4 .../org/apache/camel/component/jt400/Jt400PgmEndpointTest.java| 5 - .../org/apache/camel/component/jt400/Jt400SrvPgmEndpointTest.java | 8 components/camel-kura/pom.xml | 5 + components/camel-osgi-activator/pom.xml | 4 components/camel-osgi-activator/src/assembly/test-bundles.xml | 2 +- .../org/apache/camel/component/osgi/activator/PaxExamOptions.java | 1 + 7 files changed, 11 insertions(+), 18 deletions(-)
[camel] 02/03: Fixed tests
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 26168a3b91b36f954dda4490f69de5fe89b9459c Author: Claus Ibsen AuthorDate: Thu Mar 5 07:43:55 2020 +0100 Fixed tests --- .../java/org/apache/camel/component/jt400/Jt400EndpointTest.java | 4 .../org/apache/camel/component/jt400/Jt400PgmEndpointTest.java| 5 - .../org/apache/camel/component/jt400/Jt400SrvPgmEndpointTest.java | 8 3 files changed, 17 deletions(-) diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400EndpointTest.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400EndpointTest.java index 8b83c07..e41b6dc4 100644 --- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400EndpointTest.java +++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400EndpointTest.java @@ -45,8 +45,4 @@ public class Jt400EndpointTest extends Jt400TestSupport { assertTrue(endpoint.getSystem().isGuiAvailable()); } -@Test -public void testToString() { - assertEquals("jt400://user:xx@host/qsys.lib/library.lib/queue.dtaq?ccsid=500=%23mockPool=binary=true", endpoint.toString()); -} } diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmEndpointTest.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmEndpointTest.java index 11de5c2..3e18071 100644 --- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmEndpointTest.java +++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmEndpointTest.java @@ -58,9 +58,4 @@ public class Jt400PgmEndpointTest extends Jt400TestSupport { assertEquals(true, endpoint.isFieldIdxForOuput(2)); } -@Test -public void testToString() { - assertEquals("jt400://USER:xx@host/qsys.lib/library.lib/prog.pgm?connectionPool=%23mockPool=10%2C512%2C255=binary=true=1%2C2", - endpoint.toString()); -} } diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400SrvPgmEndpointTest.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400SrvPgmEndpointTest.java index 4b467b1..fb0f143 100644 --- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400SrvPgmEndpointTest.java +++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400SrvPgmEndpointTest.java @@ -61,12 +61,4 @@ public class Jt400SrvPgmEndpointTest extends Jt400TestSupport { assertEquals(true, endpoint.isFieldIdxForOuput(2)); } -@Test -public void testToString() { -assertEquals( - "jt400://USER:xx@host/qsys.lib/library.lib/prog.srvpgm?connectionPool=%23mockPool&" -+ "fieldsLength=10%2C512%2C255=binary=true" -+ "=1%2C2=someProcedure", -endpoint.toString()); -} }
[GitHub] [camel-k-runtime] lburgazzoli edited a comment on issue #245: Upgarde Camel to v3.1.0
lburgazzoli edited a comment on issue #245: Upgarde Camel to v3.1.0 URL: https://github.com/apache/camel-k-runtime/issues/245#issuecomment-590826860 TODO: - [x] https://github.com/apache/camel-k-runtime/issues/246 - [x] https://github.com/apache/camel-k-runtime/issues/232 - [x] https://github.com/apache/camel-k-runtime/issues/227 - [x] https://github.com/apache/camel-k-runtime/issues/236 - [x] https://github.com/apache/camel-k-runtime/issues/250 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel] 02/02: Camel-AWS2-ECS: Fixed CS
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 68742b36cb7a9170b38e52eb6eba0057a3861da7 Author: Andrea Cosentino AuthorDate: Wed Mar 4 18:43:15 2020 +0100 Camel-AWS2-ECS: Fixed CS --- .../camel/component/aws2/ecs/ECS2ComponentConfigurationTest.java| 6 ++ .../component/aws2/ecs/ECS2ComponentVerifierExtensionTest.java | 3 +-- .../org/apache/camel/component/aws2/ecs/ECS2ProducerSpringTest.java | 4 ++-- .../java/org/apache/camel/component/aws2/ecs/ECS2ProducerTest.java | 4 ++-- .../component/aws2/ecs/integration/ECS2ProducerIntegrationTest.java | 5 ++--- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurationTest.java b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurationTest.java index 2258c0d..a061142 100644 --- a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurationTest.java +++ b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurationTest.java @@ -16,15 +16,13 @@ */ package org.apache.camel.component.aws2.ecs; - -import static org.junit.jupiter.api.Assertions.assertEquals; - import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; - import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class ECS2ComponentConfigurationTest extends CamelTestSupport { @Test diff --git a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentVerifierExtensionTest.java b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentVerifierExtensionTest.java index fccab29..6cd7100 100644 --- a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentVerifierExtensionTest.java +++ b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentVerifierExtensionTest.java @@ -16,8 +16,6 @@ */ package org.apache.camel.component.aws2.ecs; -import static org.junit.jupiter.api.Assertions.assertEquals; - import java.util.HashMap; import java.util.Map; @@ -26,6 +24,7 @@ import org.apache.camel.component.extension.ComponentVerifierExtension; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ECS2ComponentVerifierExtensionTest extends CamelTestSupport { diff --git a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerSpringTest.java b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerSpringTest.java index bb23970..286f9d7 100644 --- a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerSpringTest.java +++ b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerSpringTest.java @@ -16,8 +16,6 @@ */ package org.apache.camel.component.aws2.ecs; -import static org.junit.jupiter.api.Assertions.assertEquals; - import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.Processor; @@ -30,6 +28,8 @@ import software.amazon.awssdk.services.ecs.model.DeleteClusterResponse; import software.amazon.awssdk.services.ecs.model.DescribeClustersResponse; import software.amazon.awssdk.services.ecs.model.ListClustersResponse; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class ECS2ProducerSpringTest extends CamelSpringTestSupport { @EndpointInject("mock:result") diff --git a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerTest.java b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerTest.java index 1147ecc..b687e28 100644 --- a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerTest.java +++ b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerTest.java @@ -16,8 +16,6 @@ */ package org.apache.camel.component.aws2.ecs; -import static org.junit.jupiter.api.Assertions.assertEquals; - import org.apache.camel.BindToRegistry; import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; @@ -31,6 +29,8 @@ import software.amazon.awssdk.services.ecs.model.DeleteClusterResponse; import software.amazon.awssdk.services.ecs.model.DescribeClustersResponse; import software.amazon.awssdk.services.ecs.model.ListClustersResponse; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class ECS2ProducerTest extends CamelTestSupport
[camel] 01/02: Camel-AWS2-ECS: Migrated tests to Junit5
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit a25d027e1ee2572600b2db5bf970a337a723c075 Author: Andrea Cosentino AuthorDate: Wed Mar 4 18:22:26 2020 +0100 Camel-AWS2-ECS: Migrated tests to Junit5 --- components/camel-aws2-ecs/pom.xml | 7 +-- .../component/aws2/ecs/ECS2ComponentClientRegistryTest.java | 13 + .../component/aws2/ecs/ECS2ComponentConfigurationTest.java | 8 ++-- .../aws2/ecs/ECS2ComponentVerifierExtensionTest.java| 12 +++- .../camel/component/aws2/ecs/ECS2ProducerSpringTest.java| 6 -- .../apache/camel/component/aws2/ecs/ECS2ProducerTest.java | 6 -- .../aws2/ecs/integration/ECS2ProducerIntegrationTest.java | 11 +++ 7 files changed, 38 insertions(+), 25 deletions(-) diff --git a/components/camel-aws2-ecs/pom.xml b/components/camel-aws2-ecs/pom.xml index a4ea27d..d568be1 100644 --- a/components/camel-aws2-ecs/pom.xml +++ b/components/camel-aws2-ecs/pom.xml @@ -53,13 +53,8 @@ -junit -junit -test - - org.apache.camel -camel-test-spring +camel-test-spring-junit5 test diff --git a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentClientRegistryTest.java b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentClientRegistryTest.java index a41fa76..5799572 100644 --- a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentClientRegistryTest.java +++ b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentClientRegistryTest.java @@ -16,8 +16,11 @@ */ package org.apache.camel.component.aws2.ecs; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; public class ECS2ComponentClientRegistryTest extends CamelTestSupport { @@ -32,10 +35,12 @@ public class ECS2ComponentClientRegistryTest extends CamelTestSupport { assertNotNull(endpoint.getConfiguration().getEcsClient()); } -@Test(expected = IllegalArgumentException.class) +@Test public void createEndpointWithMinimalECSClientMisconfiguration() throws Exception { ECS2Component component = context.getComponent("aws2-ecs", ECS2Component.class); -ECS2Endpoint endpoint = (ECS2Endpoint)component.createEndpoint("aws-ecs://TestDomain"); +assertThrows(IllegalArgumentException.class, () -> { +ECS2Endpoint endpoint = (ECS2Endpoint)component.createEndpoint("aws-ecs://TestDomain"); +}); } } diff --git a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurationTest.java b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurationTest.java index 68f8eaa..2258c0d 100644 --- a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurationTest.java +++ b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurationTest.java @@ -16,8 +16,12 @@ */ package org.apache.camel.component.aws2.ecs; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentVerifierExtensionTest.java b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentVerifierExtensionTest.java index 8cd58d3..fccab29 100644 --- a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentVerifierExtensionTest.java +++ b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentVerifierExtensionTest.java @@ -16,14 +16,16 @@ */ package org.apache.camel.component.aws2.ecs; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.HashMap; import java.util.Map; import org.apache.camel.Component; import org.apache.camel.component.extension.ComponentVerifierExtension; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Assert; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + public class
[camel] branch master updated (4eb0449 -> 68742b3)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 4eb0449 Add a profile to run the impsort plugin (sort and remove unused imports) new a25d027 Camel-AWS2-ECS: Migrated tests to Junit5 new 68742b3 Camel-AWS2-ECS: Fixed CS The 2 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: components/camel-aws2-ecs/pom.xml | 7 +-- .../component/aws2/ecs/ECS2ComponentClientRegistryTest.java | 13 + .../component/aws2/ecs/ECS2ComponentConfigurationTest.java | 6 -- .../aws2/ecs/ECS2ComponentVerifierExtensionTest.java| 11 ++- .../camel/component/aws2/ecs/ECS2ProducerSpringTest.java| 6 -- .../apache/camel/component/aws2/ecs/ECS2ProducerTest.java | 6 -- .../aws2/ecs/integration/ECS2ProducerIntegrationTest.java | 10 ++ 7 files changed, 34 insertions(+), 25 deletions(-)
[GitHub] [camel-k] lburgazzoli closed issue #892: Defining datasource in groovy and using in XML routes
lburgazzoli closed issue #892: Defining datasource in groovy and using in XML routes URL: https://github.com/apache/camel-k/issues/892 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-k] contactreji commented on issue #892: Defining datasource in groovy and using in XML routes
contactreji commented on issue #892: Defining datasource in groovy and using in XML routes URL: https://github.com/apache/camel-k/issues/892#issuecomment-594690600 > @contactreji can we close this one ? You can close this. thanks This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-k] contactreji commented on issue #892: Defining datasource in groovy and using in XML routes
contactreji commented on issue #892: Defining datasource in groovy and using in XML routes URL: https://github.com/apache/camel-k/issues/892#issuecomment-594690389 Closing this This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] jamesnetherton commented on issue #649: MongoDB itest fails on Camel 3.1.0-SNAPSHOT
jamesnetherton commented on issue #649: MongoDB itest fails on Camel 3.1.0-SNAPSHOT URL: https://github.com/apache/camel-quarkus/issues/649#issuecomment-594664616 Fixed in https://github.com/apache/camel-quarkus/commit/d68e8b756337bc4c0ab4714feef55e0d4a26bda3. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] jamesnetherton closed issue #649: MongoDB itest fails on Camel 3.1.0-SNAPSHOT
jamesnetherton closed issue #649: MongoDB itest fails on Camel 3.1.0-SNAPSHOT URL: https://github.com/apache/camel-quarkus/issues/649 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] jamesnetherton commented on issue #652: Automate tests against camel and quarkus master
jamesnetherton commented on issue #652: Automate tests against camel and quarkus master URL: https://github.com/apache/camel-quarkus/issues/652#issuecomment-594661175 Fixed in https://github.com/apache/camel-quarkus/commit/d032f1cfa24bd6987ba64dd24644d66a95412e71 & https://github.com/apache/camel-quarkus/commit/3ab385a437a74c3bd150a2f5f4443b4a57a2dbef. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] jamesnetherton closed issue #652: Automate tests against camel and quarkus master
jamesnetherton closed issue #652: Automate tests against camel and quarkus master URL: https://github.com/apache/camel-quarkus/issues/652 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel-k] 02/02: chore(release): fix doc about helm install
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git commit ec24683e94e50e135453e9b6a489ad12939deab3 Author: Nicola Ferraro AuthorDate: Wed Mar 4 17:31:05 2020 +0100 chore(release): fix doc about helm install --- docs/charts/index.yaml | 2 +- docs/modules/ROOT/pages/installation/installation.adoc | 6 ++ helm/camel-k/Chart.yaml| 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/charts/index.yaml b/docs/charts/index.yaml index 874b723..f88ea76 100644 --- a/docs/charts/index.yaml +++ b/docs/charts/index.yaml @@ -8,7 +8,7 @@ entries: superpowers digest: 3bc8c53c4d781c4b4e4aac254d291339b348c2d8b4cf24b579ceb4330a48edd5 home: https://camel.apache.org/camel-k/latest/ -icon: https://raw.githubusercontent.com/apache/camel/master/docs/img/logo-d.svg +icon: https://github.com/apache/camel/raw/master/docs/img/logo64-d.png keywords: - serverless - integration diff --git a/docs/modules/ROOT/pages/installation/installation.adoc b/docs/modules/ROOT/pages/installation/installation.adoc index ddc9767..9157466 100644 --- a/docs/modules/ROOT/pages/installation/installation.adoc +++ b/docs/modules/ROOT/pages/installation/installation.adoc @@ -39,3 +39,9 @@ operation can be done *once per cluster*. So, if the `kamel install` operation f For Minishift, this means executing `oc login -u system:admin` then `kamel install --cluster-setup` only for first-time installation. You're now ready to xref:running/running.adoc[run some integrations]. + +[[helm]] +== Installation via Helm + +Camel K is also available in Helm Hub for installation. +Follow the instructions on the [Camel K](https://hub.helm.sh/charts/camel-k/camel-k) page for more information. diff --git a/helm/camel-k/Chart.yaml b/helm/camel-k/Chart.yaml index 1baa72c..3728f88 100644 --- a/helm/camel-k/Chart.yaml +++ b/helm/camel-k/Chart.yaml @@ -37,7 +37,7 @@ version: 0.2.0 # incremented each time you make changes to the application. appVersion: 1.0.0-SNAPSHOT -icon: https://raw.githubusercontent.com/apache/camel/master/docs/img/logo-d.svg +icon: https://github.com/apache/camel/raw/master/docs/img/logo64-d.png home: https://camel.apache.org/camel-k/latest/ sources:
[camel-k] branch master updated (9b8c6e0 -> ec24683)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git. from 9b8c6e0 Add e2e test for the multiple files scenario #1320 new 9a63e6e chore(release): publish fixed helm charts new ec24683 chore(release): fix doc about helm install The 2 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/charts/camel-k-0.1.0.tgz | Bin 5061 -> 5060 bytes docs/charts/index.yaml| 8 .../modules/ROOT/pages/installation/installation.adoc | 6 ++ helm/camel-k/Chart.yaml | 2 +- helm/camel-k/README.md| 2 +- helm/camel-k/templates/operator-role.yaml | 1 + 6 files changed, 13 insertions(+), 6 deletions(-)
[camel-k] 01/02: chore(release): publish fixed helm charts
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 9a63e6e2552a34b44804dc89624e07cc9c0a0bc0 Author: Nicola Ferraro AuthorDate: Wed Mar 4 17:24:55 2020 +0100 chore(release): publish fixed helm charts --- docs/charts/camel-k-0.1.0.tgz | Bin 5061 -> 5060 bytes docs/charts/index.yaml| 6 +++--- helm/camel-k/README.md| 2 +- helm/camel-k/templates/operator-role.yaml | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/charts/camel-k-0.1.0.tgz b/docs/charts/camel-k-0.1.0.tgz index d8da467..6e7f1db 100644 Binary files a/docs/charts/camel-k-0.1.0.tgz and b/docs/charts/camel-k-0.1.0.tgz differ diff --git a/docs/charts/index.yaml b/docs/charts/index.yaml index b9eb394..874b723 100644 --- a/docs/charts/index.yaml +++ b/docs/charts/index.yaml @@ -3,10 +3,10 @@ entries: camel-k: - apiVersion: v2 appVersion: 1.0.0-RC2 -created: "2020-02-28T08:33:33.502300417+01:00" +created: "2020-03-04T17:22:21.67309192+01:00" description: A lightweight integration platform, born on Kubernetes, with serverless superpowers -digest: ed438ce3f3a4fb72574c4243023ff4b1eead551689c23b332da5e3103884854e +digest: 3bc8c53c4d781c4b4e4aac254d291339b348c2d8b4cf24b579ceb4330a48edd5 home: https://camel.apache.org/camel-k/latest/ icon: https://raw.githubusercontent.com/apache/camel/master/docs/img/logo-d.svg keywords: @@ -26,4 +26,4 @@ entries: urls: - https://apache.github.io/camel-k/charts/camel-k-0.1.0.tgz version: 0.1.0 -generated: "2020-02-28T08:33:33.500717761+01:00" +generated: "2020-03-04T17:22:21.671150477+01:00" diff --git a/helm/camel-k/README.md b/helm/camel-k/README.md index a50cc3a..1519824 100644 --- a/helm/camel-k/README.md +++ b/helm/camel-k/README.md @@ -16,7 +16,7 @@ Apache Camel integrations on any Kubernetes cluster. To install the chart, first add the Camel K repository: ```bash -$ helm repo add camel-k https://apache.github.io/camel-k/helm/charts +$ helm repo add camel-k https://apache.github.io/camel-k/charts ``` If you are installing on OpenShift, Camel K can use the OpenShift internal registry to diff --git a/helm/camel-k/templates/operator-role.yaml b/helm/camel-k/templates/operator-role.yaml index 5a9218a..8f3989c 100644 --- a/helm/camel-k/templates/operator-role.yaml +++ b/helm/camel-k/templates/operator-role.yaml @@ -68,6 +68,7 @@ rules: - events verbs: - create + - patch - get - list - watch
[GitHub] [camel-k] nicolaferraro merged pull request #1326: Fix helm install doc
nicolaferraro merged pull request #1326: Fix helm install doc URL: https://github.com/apache/camel-k/pull/1326 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel] 02/02: Add a profile to run the impsort plugin (sort and remove unused imports)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 4eb044932fae344f49509a1ede2d3b58e59d0a93 Author: Guillaume Nodet AuthorDate: Wed Mar 4 17:54:02 2020 +0100 Add a profile to run the impsort plugin (sort and remove unused imports) --- parent/pom.xml | 29 + 1 file changed, 29 insertions(+) diff --git a/parent/pom.xml b/parent/pom.xml index ce17d6b..1bfc2a9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -299,6 +299,7 @@ 1.0.7 65.1 2.7.6 +1.3.2 10.1.3.Final 2.17 2.17_1 @@ -4500,6 +4501,34 @@ +impsort + + + +net.revelc.code +impsort-maven-plugin +${impsort-maven-plugin-version} + + +sort-imports + +sort + +process-sources + + java.,javax.,org.w3c.,org.xml.,junit.,* +**/package-info.java +true +true + + + + + + + + + sourcecheck
[camel] branch master updated (d812ac7 -> 4eb0449)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from d812ac7 CAMEL-14640: Upgrade nimbus new 2d434b3 CS: Fix all imports new 4eb0449 Add a profile to run the impsort plugin (sort and remove unused imports) The 2 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: .../org/apache/camel/catalog/CamelCatalogTest.java | 2 +- .../client/AbstractAtomixClientProducer.java | 1 - .../client/messaging/AtomixMessagingConsumer.java | 1 - .../AtomixClientRoutePolicyFactoryTestSupport.java | 2 +- .../AtomixClientRoutePolicyTestSupport.java| 2 +- .../cluster/AtomixRoutePolicyFactoryTest.java | 2 +- .../atomix/cluster/AtomixRoutePolicyTest.java | 2 +- .../component/avro/AvroConsumerTestSupport.java| 3 +- .../DdbStreamComponentConfigurationTest.java | 1 - .../aws/firehose/KinesisFirehoseComponent.java | 2 - .../aws/firehose/KinesisFirehoseProducerTest.java | 1 - .../component/aws/kinesis/KinesisProducerTest.java | 1 - .../camel/component/aws/sqs/SqsProducerTest.java | 1 - .../camel/component/aws/swf/SWFComponent.java | 1 - .../camel/component/aws/swf/SWFEndpoint.java | 1 - .../aws/translate/TranslateComponent.java | 1 - .../component/aws2/ddb/AmazonDDBClientMock.java| 2 - .../firehose/KinesisFirehose2Configuration.java| 1 - .../aws2/sns/SnsComponentConfigurationTest.java| 1 - .../component/aws2/sqs/SqsComponentSpringTest.java | 1 - .../azure/queue/QueueServiceComponent.java | 1 - .../java/org/apache/camel/language/bean/Bean.java | 2 +- .../integration/PutProducerIntegrationTest.java| 1 - .../camel/dataformat/bindy/UnicodeHelperTest.java | 1 - .../bindy/csv/BindySimpleCsvMarshallDslTest.java | 1 - .../BlueprintModelJAXBContextFactory.java | 4 +- .../camel/component/browse/BrowseComponent.java| 2 +- .../JtaTransactionErrorHandlerReifier.java | 2 +- .../cdi/transaction/JtaTransactionPolicy.java | 2 +- .../camel/cdi/xml/ErrorHandlerDefinition.java | 1 - .../camel/coap/CoAPRestComponentTestBase.java | 1 - .../ConsulClusteredRoutePolicyFactoryTest.java | 2 +- .../cluster/ConsulClusteredRoutePolicyTest.java| 2 +- .../camel/component/corda/CordaComponent.java | 1 - .../component/couchbase/CouchbaseConsumer.java | 1 - .../component/couchbase/CouchbaseProducer.java | 1 - .../crypto/cms/sig/SignedDataVerifier.java | 1 - .../camel/component/cxf/ssl/SslGlobalTest.java | 1 - .../camel/component/dataset/DataSetComponent.java | 2 +- .../component/dataset/DataSetTestComponent.java| 2 +- .../component/debezium/DebeziumComponent.java | 2 +- .../it/DockerCustomCmdExecFactoryTestIT.java | 2 - .../elasticsearch/ElasticsearchProducer.java | 1 - .../elasticsearch/ElasticsearchBaseTest.java | 1 - .../camel/component/elytron/ElytronConsumer.java | 2 - .../camel/component/elytron/BaseElytronTest.java | 2 - .../apache/camel/component/etcd/EtcdKeysTest.java | 1 - .../camel/component/facebook/FacebookConsumer.java | 1 - .../camel/component/facebook/FacebookEndpoint.java | 1 - .../camel/component/fhir/FhirConfigurationIT.java | 1 - .../fhir/FhirCustomClientConfigurationIT.java | 2 - .../camel/component/fhir/FhirOperationIT.java | 1 - .../camel/component/file/GenericFileEndpoint.java | 1 - .../camel/component/file/remote/FtpsEndpoint.java | 1 - .../FromFtpConsumerTemplateRollbackTest.java | 2 +- ...FtpConsumerThrowExceptionOnLoginFailedTest.java | 2 +- .../file/remote/FtpProducerDoneFileNameTest.java | 2 +- .../file/remote/FtpProducerFileExistFailTest.java | 2 +- .../file/remote/OsgiParserFactoryTest.java | 2 +- .../component/file/remote/sftp/SftpChmodTest.java | 3 +- .../stream/GoogleCalendarStreamConsumer.java | 1 - .../mail/stream/GoogleMailStreamConsumer.java | 1 - .../google/pubsub/GooglePubsubEndpoint.java| 6 - .../pubsub/integration/AcknowledgementTest.java| 1 - .../integration/GroupedExchangeRoundtripTest.java | 1 - .../integration/SingleExchangeRoundtripTest.java | 1 - .../camel/component/grpc/GrpcConfiguration.java| 1 - .../hazelcast/set/HazelcastSetEndpoint.java| 1 - .../camel/component/hbase/HBaseProducerTest.java | 1 - .../camel/component/hdfs/HdfsConsumerTest.java | 1 - .../camel/component/hipchat/HipchatProducer.java | 1 - .../camel/component/hl7/HL7MLLPCodecLongTest.java | 2 - .../hl7/HL7MLLPCodecMessageFloodingTest.java |
[GitHub] [camel-quarkus] lburgazzoli opened a new issue #847: Support for camel-xml-io
lburgazzoli opened a new issue #847: Support for camel-xml-io URL: https://github.com/apache/camel-quarkus/issues/847 camel-quarkus XML support requires camel-xml-jaxb but in camel 3.1.0 there is a new lightweight implementation camel-xml-io We probably need to have two extensions: - camel-quarkus-core-xml-jaxb - camel-quarkus-core-xml-io To match camel's layout This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] jamesnetherton closed issue #815: Master support
jamesnetherton closed issue #815: Master support URL: https://github.com/apache/camel-quarkus/issues/815 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] jamesnetherton commented on issue #815: Master support
jamesnetherton commented on issue #815: Master support URL: https://github.com/apache/camel-quarkus/issues/815#issuecomment-594655545 Duplicate of https://github.com/apache/camel-quarkus/issues/711. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] jamesnetherton closed issue #783: GZip Deflater support
jamesnetherton closed issue #783: GZip Deflater support URL: https://github.com/apache/camel-quarkus/issues/783 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] jamesnetherton commented on issue #783: GZip Deflater support
jamesnetherton commented on issue #783: GZip Deflater support URL: https://github.com/apache/camel-quarkus/issues/783#issuecomment-594654293 Fixed in https://github.com/apache/camel-quarkus/commit/72e2d3c5a8798336b6de970e3286778c836d23d3. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-k-runtime] lburgazzoli edited a comment on issue #245: Upgarde Camel to v3.1.0
lburgazzoli edited a comment on issue #245: Upgarde Camel to v3.1.0 URL: https://github.com/apache/camel-k-runtime/issues/245#issuecomment-590826860 TODO: - [ ] https://github.com/apache/camel-k-runtime/issues/246 - [x] https://github.com/apache/camel-k-runtime/issues/232 - [x] https://github.com/apache/camel-k-runtime/issues/227 - [x] https://github.com/apache/camel-k-runtime/issues/236 - [x] https://github.com/apache/camel-k-runtime/issues/250 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-k] nicolaferraro opened a new pull request #1326: Fix helm install doc
nicolaferraro opened a new pull request #1326: Fix helm install doc URL: https://github.com/apache/camel-k/pull/1326 **Release Note** ```release-note NONE ``` This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-k] nicolaferraro opened a new issue #1325: Add a 3scale addon
nicolaferraro opened a new issue #1325: Add a 3scale addon URL: https://github.com/apache/camel-k/issues/1325 It would be nice to provide an addon that adds some annotations that allow an API manager like 3scale to discover the service created by camel k. The addon can be disabled by default and, if enabled, it can add e.g. the following annotations to the service: - "discovery.3scale.net/scheme" (required): "http" (customizable, but probably fixed) - "discovery.3scale.net/port" (required): "80" (by default, it's the service port, not the container port, customizable) - "discovery.3scale.net/path": the root path, if provided in trait customization - "discovery.3scale.net/description-path": "/openapi.json" (or the path to the openapi spec if available, customizable) And label: - "discovery.3scale.net" (required): "true" This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel] branch master updated: CAMEL-14640: Upgrade nimbus
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new d812ac7 CAMEL-14640: Upgrade nimbus d812ac7 is described below commit d812ac7332d3ddb5167364f603f3871108669146 Author: Claus Ibsen AuthorDate: Wed Mar 4 16:48:34 2020 +0100 CAMEL-14640: Upgrade nimbus --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 6d359fd..ce17d6b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -500,7 +500,7 @@ 2.0.3 4.0.56.Final 1.0.31 -4.13.1 +8.9 3.3.0 0.5_1 2.6
[GitHub] [camel-k] bouskaJ commented on a change in pull request #1324: [ADD] Add rest test
bouskaJ commented on a change in pull request #1324: [ADD] Add rest test URL: https://github.com/apache/camel-k/pull/1324#discussion_r387747978 ## File path: e2e/rest_test.go ## @@ -0,0 +1,86 @@ +// +build integration + +// To enable compilation of this file in Goland, go to "Settings -> Go -> Vendoring & Build Tags -> Custom Tags" and add "knative" + +/* +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 e2e + +import ( + "fmt" + "net/http" + "testing" + "bytes" + + "github.com/apache/camel-k/pkg/util/openshift" + . "github.com/onsi/gomega" + "github.com/stretchr/testify/assert" + v1 "k8s.io/api/core/v1" +) + +func TestRunREST(t *testing.T) { + withNewTestNamespace(t, func(ns string) { + var profile string + ocp, err := openshift.IsOpenShift(testClient) + assert.Nil(t, err) + if ocp { + profile = "OpenShift" + } else { + profile = "Kubernetes" + } + + Expect(kamel("install", "-n", ns, "--trait-profile", profile).Execute()).Should(BeNil()) + Expect(kamel("run", "-n", ns, "files/RestConsumer.java", "-d", "camel:undertow").Execute()).Should(BeNil()) + Eventually(integrationPodPhase(ns, "rest-consumer"), testTimeoutMedium).Should(Equal(v1.PodRunning)) + + t.Run("Service works", func(t *testing.T) { + name := "John" + service := service(ns, "rest-consumer") + Eventually(service, testTimeoutShort).ShouldNot(BeNil()) + Expect(kamel("run", "-n", ns, "files/RestProducer.groovy", "-p", "serviceIp="+service().Spec.ClusterIP, "-p", "name="+name).Execute()).Should(BeNil()) Review comment: You are right. Thank you for the suggestion. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-k] bouskaJ commented on a change in pull request #1324: [ADD] Add rest test
bouskaJ commented on a change in pull request #1324: [ADD] Add rest test URL: https://github.com/apache/camel-k/pull/1324#discussion_r387748146 ## File path: e2e/rest_test.go ## @@ -0,0 +1,86 @@ +// +build integration + +// To enable compilation of this file in Goland, go to "Settings -> Go -> Vendoring & Build Tags -> Custom Tags" and add "knative" + +/* +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 e2e + +import ( + "fmt" + "net/http" + "testing" + "bytes" + + "github.com/apache/camel-k/pkg/util/openshift" + . "github.com/onsi/gomega" + "github.com/stretchr/testify/assert" + v1 "k8s.io/api/core/v1" +) + +func TestRunREST(t *testing.T) { + withNewTestNamespace(t, func(ns string) { + var profile string + ocp, err := openshift.IsOpenShift(testClient) + assert.Nil(t, err) + if ocp { + profile = "OpenShift" + } else { + profile = "Kubernetes" + } + + Expect(kamel("install", "-n", ns, "--trait-profile", profile).Execute()).Should(BeNil()) + Expect(kamel("run", "-n", ns, "files/RestConsumer.java", "-d", "camel:undertow").Execute()).Should(BeNil()) + Eventually(integrationPodPhase(ns, "rest-consumer"), testTimeoutMedium).Should(Equal(v1.PodRunning)) + + t.Run("Service works", func(t *testing.T) { + name := "John" + service := service(ns, "rest-consumer") + Eventually(service, testTimeoutShort).ShouldNot(BeNil()) + Expect(kamel("run", "-n", ns, "files/RestProducer.groovy", "-p", "serviceIp="+service().Spec.ClusterIP, "-p", "name="+name).Execute()).Should(BeNil()) Review comment: Fixed. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel] branch master updated: Camel-Cloud: Fixed CS
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new eb62457 Camel-Cloud: Fixed CS eb62457 is described below commit eb62457c8f075100e10165d0ae01fdaabb9bdd0c Author: Andrea Cosentino AuthorDate: Wed Mar 4 16:34:16 2020 +0100 Camel-Cloud: Fixed CS --- .../java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java index e8f54f1..982e58d 100644 --- a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java +++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java @@ -26,6 +26,7 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.Expression; import org.apache.camel.ExtendedCamelContext; import org.apache.camel.Processor; +import org.apache.camel.Route; import org.apache.camel.cloud.ServiceChooser; import org.apache.camel.cloud.ServiceChooserAware; import org.apache.camel.cloud.ServiceDiscovery; @@ -39,7 +40,6 @@ import org.apache.camel.model.Model; import org.apache.camel.model.cloud.ServiceCallConfigurationDefinition; import org.apache.camel.model.cloud.ServiceCallDefinition; import org.apache.camel.model.cloud.ServiceCallDefinitionConstants; -import org.apache.camel.Route; import org.apache.camel.support.CamelContextHelper; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.function.Suppliers;
[GitHub] [camel-quarkus] carlosthe19916 commented on a change in pull request #835: Camel-freemarker component
carlosthe19916 commented on a change in pull request #835: Camel-freemarker component URL: https://github.com/apache/camel-quarkus/pull/835#discussion_r387728766 ## File path: extensions/freemarker/runtime/pom.xml ## @@ -0,0 +1,82 @@ + + +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;> +4.0.0 + +org.apache.camel.quarkus +camel-quarkus-freemarker-parent +1.1.0-SNAPSHOT +../pom.xml + + +camel-quarkus-freemarker +Camel Quarkus :: Freemarker :: Runtime + + +0.4.0 Review comment: done This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] jamesnetherton closed pull request #846: Add AMQP extension
jamesnetherton closed pull request #846: Add AMQP extension URL: https://github.com/apache/camel-quarkus/pull/846 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-k] nicolaferraro closed issue #1320: Add e2e test for the multiple files scenario
nicolaferraro closed issue #1320: Add e2e test for the multiple files scenario URL: https://github.com/apache/camel-k/issues/1320 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel-k] branch master updated: Add e2e test for the multiple files scenario #1320
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/master by this push: new 9b8c6e0 Add e2e test for the multiple files scenario #1320 9b8c6e0 is described below commit 9b8c6e0382ea11697dd3ca874bf55645353670d5 Author: lburgazzoli AuthorDate: Tue Mar 3 13:28:39 2020 +0100 Add e2e test for the multiple files scenario #1320 --- e2e/files/js-polyglot.js | 21 + e2e/files/yaml-polyglot.yaml | 28 e2e/run_test.go | 9 + 3 files changed, 58 insertions(+) diff --git a/e2e/files/js-polyglot.js b/e2e/files/js-polyglot.js new file mode 100644 index 000..235655e --- /dev/null +++ b/e2e/files/js-polyglot.js @@ -0,0 +1,21 @@ +// 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. + +from('timer:js?period=1s') +.routeId('js') +.setHeader("m").constant("polyglot-js") +.setBody() +.simple('Magic${header.m}') +.to('log:info') \ No newline at end of file diff --git a/e2e/files/yaml-polyglot.yaml b/e2e/files/yaml-polyglot.yaml new file mode 100644 index 000..ca08ce3 --- /dev/null +++ b/e2e/files/yaml-polyglot.yaml @@ -0,0 +1,28 @@ +# --- +# 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. +# --- + +- from: +uri: "timer:yaml" +parameters: + period: "5s" +steps: + - set-header: + name: "m" + constant: "polyglot-yaml" + - set-body: + simple: "Magic${header.m}" + - to: "log:info" diff --git a/e2e/run_test.go b/e2e/run_test.go index ae3911d..1e1d887 100644 --- a/e2e/run_test.go +++ b/e2e/run_test.go @@ -97,5 +97,14 @@ func TestRunSimpleExamples(t *testing.T) { Expect(kamel("delete", "--all", "-n", ns).Execute()).Should(BeNil()) }) + t.Run("run polyglot", func(t *testing.T) { + RegisterTestingT(t) + Expect(kamel("run", "-n", ns, "--name", "polyglot", "files/js-polyglot.js", "files/yaml-polyglot.yaml").Execute()).Should(BeNil()) + Eventually(integrationPodPhase(ns, "polyglot"), testTimeoutMedium).Should(Equal(v1.PodRunning)) + Eventually(integrationLogs(ns, "polyglot"), testTimeoutShort).Should(ContainSubstring("Magicpolyglot-yaml")) + Eventually(integrationLogs(ns, "polyglot"), testTimeoutShort).Should(ContainSubstring("Magicpolyglot-js")) + Expect(kamel("delete", "--all", "-n", ns).Execute()).Should(BeNil()) + }) + }) }
[GitHub] [camel-k] nicolaferraro merged pull request #1322: Add e2e test for the multiple files scenario
nicolaferraro merged pull request #1322: Add e2e test for the multiple files scenario URL: https://github.com/apache/camel-k/pull/1322 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-k] nicolaferraro commented on a change in pull request #1324: [ADD] Add rest test
nicolaferraro commented on a change in pull request #1324: [ADD] Add rest test URL: https://github.com/apache/camel-k/pull/1324#discussion_r387724815 ## File path: e2e/rest_test.go ## @@ -0,0 +1,86 @@ +// +build integration + +// To enable compilation of this file in Goland, go to "Settings -> Go -> Vendoring & Build Tags -> Custom Tags" and add "knative" + +/* +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 e2e + +import ( + "fmt" + "net/http" + "testing" + "bytes" + + "github.com/apache/camel-k/pkg/util/openshift" + . "github.com/onsi/gomega" + "github.com/stretchr/testify/assert" + v1 "k8s.io/api/core/v1" +) + +func TestRunREST(t *testing.T) { + withNewTestNamespace(t, func(ns string) { + var profile string + ocp, err := openshift.IsOpenShift(testClient) + assert.Nil(t, err) + if ocp { + profile = "OpenShift" + } else { + profile = "Kubernetes" + } + + Expect(kamel("install", "-n", ns, "--trait-profile", profile).Execute()).Should(BeNil()) + Expect(kamel("run", "-n", ns, "files/RestConsumer.java", "-d", "camel:undertow").Execute()).Should(BeNil()) + Eventually(integrationPodPhase(ns, "rest-consumer"), testTimeoutMedium).Should(Equal(v1.PodRunning)) + + t.Run("Service works", func(t *testing.T) { + name := "John" + service := service(ns, "rest-consumer") + Eventually(service, testTimeoutShort).ShouldNot(BeNil()) + Expect(kamel("run", "-n", ns, "files/RestProducer.groovy", "-p", "serviceIp="+service().Spec.ClusterIP, "-p", "name="+name).Execute()).Should(BeNil()) Review comment: ```suggestion Expect(kamel("run", "-n", ns, "files/RestProducer.groovy", "-p", "serviceIp=rest-consumer", "-p", "name="+name).Execute()).Should(BeNil()) ``` Shouldn't this be enough? We usually tell users to use DNS This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-k] nicolaferraro commented on a change in pull request #1324: [ADD] Add rest test
nicolaferraro commented on a change in pull request #1324: [ADD] Add rest test URL: https://github.com/apache/camel-k/pull/1324#discussion_r387721438 ## File path: e2e/rest_test.go ## @@ -0,0 +1,86 @@ +// +build integration + +// To enable compilation of this file in Goland, go to "Settings -> Go -> Vendoring & Build Tags -> Custom Tags" and add "knative" + +/* +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 e2e + +import ( + "fmt" + "net/http" + "testing" + "bytes" + + "github.com/apache/camel-k/pkg/util/openshift" + . "github.com/onsi/gomega" + "github.com/stretchr/testify/assert" + v1 "k8s.io/api/core/v1" +) + +func TestRunREST(t *testing.T) { + withNewTestNamespace(t, func(ns string) { + var profile string + ocp, err := openshift.IsOpenShift(testClient) + assert.Nil(t, err) + if ocp { + profile = "OpenShift" + } else { + profile = "Kubernetes" + } + + Expect(kamel("install", "-n", ns, "--trait-profile", profile).Execute()).Should(BeNil()) + Expect(kamel("run", "-n", ns, "files/RestConsumer.java", "-d", "camel:undertow").Execute()).Should(BeNil()) + Eventually(integrationPodPhase(ns, "rest-consumer"), testTimeoutMedium).Should(Equal(v1.PodRunning)) + + t.Run("Service works", func(t *testing.T) { + name := "John" + service := service(ns, "rest-consumer") + Eventually(service, testTimeoutShort).ShouldNot(BeNil()) + Expect(kamel("run", "-n", ns, "files/RestProducer.groovy", "-p", "serviceIp="+service().Spec.ClusterIP, "-p", "name="+name).Execute()).Should(BeNil()) + Eventually(integrationPodPhase(ns, "rest-producer"), testTimeoutMedium).Should(Equal(v1.PodRunning)) + Eventually(integrationLogs(ns, "rest-consumer"), testTimeoutShort).Should(ContainSubstring(fmt.Sprintf("get %s", name))) + Eventually(integrationLogs(ns, "rest-producer"), testTimeoutShort).Should(ContainSubstring(fmt.Sprintf("%s Doe", name))) + }) + + if ocp { + t.Run("Route works", func(t *testing.T) { + name := "Peter" + route := route(ns, "rest-consumer") + Eventually(route, testTimeoutShort).ShouldNot(BeNil()) + response := httpReqest(t, fmt.Sprintf("http://%s/customers/%s;, route().Spec.Host, name)) + assert.Equal(t, fmt.Sprintf("%s Doe", name), response) Review comment: Awesome This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] ppalaga commented on a change in pull request #835: Camel-freemarker component
ppalaga commented on a change in pull request #835: Camel-freemarker component URL: https://github.com/apache/camel-quarkus/pull/835#discussion_r387719646 ## File path: integration-tests/freemarker/src/main/resources/application.properties ## @@ -0,0 +1,20 @@ +## --- +## 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. +## --- +# +# Quarkus +# +quarkus.camel.freemarker.locations = org/apache/camel/component/freemarker Review comment: > Only files with the extension `.ftl` will be included. Thanks for the info, I have not noticed that and I must say I do not think we should be selecting only `*.ftl` files. I commonly used other or no extensions for FreeMarker template files in the past. I think many people do that because because of syntax highlighting in editors. There is even a couple of examples in this repo: https://github.com/apache/camel-quarkus/tree/master/tooling/create-extension-templates I think we should either include whole subtrees or we should have path includes and excludes like we have in https://github.com/apache/camel-quarkus/blob/master/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java#L74-L100 WDYT? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-k] bouskaJ opened a new pull request #1324: [ADD] Add rest test
bouskaJ opened a new pull request #1324: [ADD] Add rest test URL: https://github.com/apache/camel-k/pull/1324 Add test for REST service. This test covers: - REST DSL route - dependency trait (see `"run", "-n", ns, "files/RestConsumer.java", "-d", "camel:undertow` - custom properties (`"run", "-n", ns, "files/RestProducer.groovy", "-p", "serviceIp="+service().Spec.ClusterIP, "-p", "name="+name`) - service trait - route trait This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel] 02/02: Camel-AWS2-EC2: Fixed CS
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 4b1d01a38c37a6168ab04fa996ecee2d89b2ae7d Author: Andrea Cosentino AuthorDate: Wed Mar 4 15:45:22 2020 +0100 Camel-AWS2-EC2: Fixed CS --- .../java/org/apache/camel/component/aws2/ec2/EC2OperationsTest.java | 4 ++-- .../java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java | 1 - .../component/aws2/ec2/integration/EC2ComponentIntegrationTest.java | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2OperationsTest.java b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2OperationsTest.java index 235116b..3834658 100644 --- a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2OperationsTest.java +++ b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2OperationsTest.java @@ -16,10 +16,10 @@ */ package org.apache.camel.component.aws2.ec2; -import static org.junit.jupiter.api.Assertions.assertEquals; - import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class EC2OperationsTest { @Test diff --git a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java index d31d6c2..795a0f9 100644 --- a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java +++ b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java @@ -27,7 +27,6 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; - import software.amazon.awssdk.services.ec2.model.DescribeInstanceStatusResponse; import software.amazon.awssdk.services.ec2.model.DescribeInstancesResponse; import software.amazon.awssdk.services.ec2.model.InstanceStateName; diff --git a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/EC2ComponentIntegrationTest.java b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/EC2ComponentIntegrationTest.java index de9dc88..563a3c3 100644 --- a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/EC2ComponentIntegrationTest.java +++ b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/EC2ComponentIntegrationTest.java @@ -27,7 +27,6 @@ import org.apache.camel.component.aws2.ec2.AWS2EC2Operations; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; - import software.amazon.awssdk.services.ec2.model.InstanceType; @Disabled("Must be manually tested. Provide your own accessKey and secretKey!")
[camel] branch master updated (511aa85 -> 4b1d01a)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 511aa85 Camel-Management: Fixed CS new 5d6242e Camel-AWS2-EC2: Migrated tests to Junit5 new 4b1d01a Camel-AWS2-EC2: Fixed CS The 2 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: components/camel-aws2-ec2/pom.xml | 7 + .../aws2/ec2/EC2ComponentClientRegistryTest.java | 13 ++--- .../aws2/ec2/EC2ComponentConfigurationTest.java| 33 +++--- .../component/aws2/ec2/EC2ComponentSpringTest.java | 6 ++-- .../ec2/EC2ComponentVerifierExtensionTest.java | 11 .../component/aws2/ec2/EC2OperationsTest.java | 4 +-- .../camel/component/aws2/ec2/EC2ProducerTest.java | 6 ++-- .../integration/EC2ComponentIntegrationTest.java | 8 +++--- 8 files changed, 53 insertions(+), 35 deletions(-)
[GitHub] [camel-quarkus] carlosthe19916 commented on a change in pull request #835: Camel-freemarker component
carlosthe19916 commented on a change in pull request #835: Camel-freemarker component URL: https://github.com/apache/camel-quarkus/pull/835#discussion_r387698284 ## File path: extensions/freemarker/deployment/src/main/java/org/apache/camel/quarkus/component/freemarker/deployment/FreemarkerNativeImageProcessor.java ## @@ -0,0 +1,136 @@ +/* + * 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.freemarker.deployment; + +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.file.FileSystem; +import java.nio.file.FileSystems; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem; +import org.apache.camel.quarkus.component.freemarker.CamelFreemarkerConfig; +import org.apache.commons.io.FilenameUtils; +import org.jboss.logging.Logger; + +class FreemarkerNativeImageProcessor { +private static final String CLASSPATH_APPLICATION_MIGRATIONS_PROTOCOL = "classpath"; +private static final String JAR_APPLICATION_MIGRATIONS_PROTOCOL = "jar"; +private static final String FILE_APPLICATION_MIGRATIONS_PROTOCOL = "file"; + +private static final Logger LOGGER = Logger.getLogger(FreemarkerNativeImageProcessor.class); + +@BuildStep(loadsApplicationClasses = true) +void build( +BuildProducer resourceProducer, +CamelFreemarkerConfig camelFreemarkerConfig) throws IOException, URISyntaxException { +registerNativeImageResources(resourceProducer, camelFreemarkerConfig); Review comment: done This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] ppalaga commented on a change in pull request #835: Camel-freemarker component
ppalaga commented on a change in pull request #835: Camel-freemarker component URL: https://github.com/apache/camel-quarkus/pull/835#discussion_r387698516 ## File path: extensions/freemarker/deployment/src/main/java/org/apache/camel/quarkus/component/freemarker/deployment/FreemarkerNativeImageProcessor.java ## @@ -0,0 +1,136 @@ +/* + * 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.freemarker.deployment; + +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.file.FileSystem; +import java.nio.file.FileSystems; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem; +import org.apache.camel.quarkus.component.freemarker.CamelFreemarkerConfig; +import org.apache.commons.io.FilenameUtils; +import org.jboss.logging.Logger; + +class FreemarkerNativeImageProcessor { +private static final String CLASSPATH_APPLICATION_MIGRATIONS_PROTOCOL = "classpath"; +private static final String JAR_APPLICATION_MIGRATIONS_PROTOCOL = "jar"; +private static final String FILE_APPLICATION_MIGRATIONS_PROTOCOL = "file"; + +private static final Logger LOGGER = Logger.getLogger(FreemarkerNativeImageProcessor.class); + +@BuildStep(loadsApplicationClasses = true) +void build( +BuildProducer resourceProducer, +CamelFreemarkerConfig camelFreemarkerConfig) throws IOException, URISyntaxException { +registerNativeImageResources(resourceProducer, camelFreemarkerConfig); +} + +private void registerNativeImageResources( +BuildProducer resource, +CamelFreemarkerConfig camelFreemarkerConfig) throws IOException, URISyntaxException { +List templates = discoverFreemarkerTemplates(camelFreemarkerConfig); +final List nativeResources = new ArrayList<>(templates); +resource.produce(new NativeImageResourceBuildItem(nativeResources.toArray(new String[0]))); +} + +private List discoverFreemarkerTemplates( +CamelFreemarkerConfig camelFreemarkerConfig) throws IOException, URISyntaxException { +List resources = new ArrayList<>(); +try { +List locations = new ArrayList<>(camelFreemarkerConfig.locations); +if (locations.isEmpty()) { +locations.add("freemarker/templates"); +} + +// Locations can be a comma separated list +for (String location : locations) { +// Strip any 'classpath:' protocol prefixes because they are assumed +// but not recognized by ClassLoader.getResources() +if (location != null && location.startsWith(CLASSPATH_APPLICATION_MIGRATIONS_PROTOCOL + ':')) { Review comment: Hm..., I wonder how the MicroProfile config impl used by Quarkus would parse a double comma value like this ``` quarkus.camel.freemarker.locations = my/path1,,my/path2 ``` This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] carlosthe19916 commented on a change in pull request #835: Camel-freemarker component
carlosthe19916 commented on a change in pull request #835: Camel-freemarker component URL: https://github.com/apache/camel-quarkus/pull/835#discussion_r387694745 ## File path: integration-tests/freemarker/src/main/resources/application.properties ## @@ -0,0 +1,20 @@ +## --- +## 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. +## --- +# +# Quarkus +# +quarkus.camel.freemarker.locations = org/apache/camel/component/freemarker Review comment: Only files with the extension `.ftl` will be included. You can see there is a filter for that [here](https://github.com/carlosthe19916/camel-quarkus/blob/7d45a783e5b27d341b6a07df49b34087f636dad3/extensions/freemarker/deployment/src/main/java/org/apache/camel/quarkus/component/freemarker/deployment/FreemarkerNativeImageProcessor.java#L119)... I've also created 2 native images, the first one using `org/apache/camel/component/freemarker` and the second one using `myfreemarkerfolder` and the sizes are exactly the same (45.8Â MB) This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel] branch master updated: Camel-Management: Fixed CS
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 511aa85 Camel-Management: Fixed CS 511aa85 is described below commit 511aa85f092b41e9f47b22ac351aee3dd2b622f7 Author: Andrea Cosentino AuthorDate: Wed Mar 4 15:17:14 2020 +0100 Camel-Management: Fixed CS --- .../apache/camel/management/DefaultManagementObjectNameStrategy.java| 2 +- .../org/apache/camel/management/DefaultManagementObjectStrategy.java| 2 +- .../org/apache/camel/management/JmxManagementLifecycleStrategy.java | 2 +- .../java/org/apache/camel/management/mbean/ManagedErrorHandler.java | 2 +- .../test/java/org/apache/camel/management/ManagedCustomPolicyTest.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectNameStrategy.java b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectNameStrategy.java index 97d769e..e4e69ee 100644 --- a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectNameStrategy.java +++ b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectNameStrategy.java @@ -31,6 +31,7 @@ import org.apache.camel.ErrorHandlerFactory; import org.apache.camel.NamedNode; import org.apache.camel.Processor; import org.apache.camel.Producer; +import org.apache.camel.Route; import org.apache.camel.Service; import org.apache.camel.StaticService; import org.apache.camel.builder.ErrorHandlerBuilderRef; @@ -58,7 +59,6 @@ import org.apache.camel.reifier.errorhandler.ErrorHandlerReifier; import org.apache.camel.spi.DataFormat; import org.apache.camel.spi.EventNotifier; import org.apache.camel.spi.ManagementObjectNameStrategy; -import org.apache.camel.Route; import org.apache.camel.util.InetAddressUtil; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.URISupport; diff --git a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java index 6815e9a..5fc59e0 100644 --- a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java +++ b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java @@ -28,6 +28,7 @@ import org.apache.camel.ErrorHandlerFactory; import org.apache.camel.NamedNode; import org.apache.camel.Processor; import org.apache.camel.Producer; +import org.apache.camel.Route; import org.apache.camel.Service; import org.apache.camel.cluster.CamelClusterService; import org.apache.camel.component.bean.BeanProcessor; @@ -173,7 +174,6 @@ import org.apache.camel.spi.BrowsableEndpoint; import org.apache.camel.spi.DataFormat; import org.apache.camel.spi.EventNotifier; import org.apache.camel.spi.ManagementObjectStrategy; -import org.apache.camel.Route; import org.apache.camel.support.ScheduledPollConsumer; import org.apache.camel.support.processor.MarshalProcessor; import org.apache.camel.support.processor.PredicateValidatingProcessor; diff --git a/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementLifecycleStrategy.java b/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementLifecycleStrategy.java index 03210c6..eb9e61c 100644 --- a/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementLifecycleStrategy.java +++ b/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementLifecycleStrategy.java @@ -43,6 +43,7 @@ import org.apache.camel.NamedNode; import org.apache.camel.NonManagedService; import org.apache.camel.Processor; import org.apache.camel.Producer; +import org.apache.camel.Route; import org.apache.camel.RuntimeCamelException; import org.apache.camel.Service; import org.apache.camel.StartupListener; @@ -95,7 +96,6 @@ import org.apache.camel.spi.ManagementObjectStrategy; import org.apache.camel.spi.ManagementStrategy; import org.apache.camel.spi.ProducerCache; import org.apache.camel.spi.RestRegistry; -import org.apache.camel.Route; import org.apache.camel.spi.RuntimeEndpointRegistry; import org.apache.camel.spi.StreamCachingStrategy; import org.apache.camel.spi.Tracer; diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedErrorHandler.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedErrorHandler.java index 2862351..17f4a8f 100644 --- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedErrorHandler.java +++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedErrorHandler.java @@ -19,12 +19,12
[GitHub] [camel-quarkus] ppalaga commented on issue #844: Duplicate LICENSE(.txt) and NOTICE(.txt) files in the source distribution
ppalaga commented on issue #844: Duplicate LICENSE(.txt) and NOTICE(.txt) files in the source distribution URL: https://github.com/apache/camel-quarkus/issues/844#issuecomment-594546304 OK, let me try `mvn -Prelease release:prepare -DpushChanges=false` This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel] branch master updated: Camel-core: Fixed CS
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 9bd504e Camel-core: Fixed CS 9bd504e is described below commit 9bd504e5990b90cd3f4411eab9ec9c8b09c609c5 Author: Andrea Cosentino AuthorDate: Wed Mar 4 15:03:22 2020 +0100 Camel-core: Fixed CS --- .../camel/component/bean/BeanExchangeAsReturnTypeNotAllowedTest.java| 2 +- .../java/org/apache/camel/component/bean/BeanImplicitMethodTest.java| 2 +- .../apache/camel/component/bean/BeanReturnCallableReturnNullTest.java | 2 +- .../java/org/apache/camel/component/bean/BeanReturnCallableTest.java| 2 +- .../apache/camel/component/bean/BeanWithAnnotationAndExchangeTest.java | 2 +- .../camel/component/bean/BeanWithExchangeExceptionAnnotationTest.java | 2 +- .../test/java/org/apache/camel/component/bean/BeanWithHeaderTest.java | 2 +- .../component/file/cluster/FileLockClusteredRoutePolicyFactoryTest.java | 2 +- .../camel/component/file/cluster/FileLockClusteredRoutePolicyTest.java | 2 +- .../src/test/java/org/apache/camel/impl/DummyLifecycleStrategy.java | 2 +- .../src/test/java/org/apache/camel/issues/AdviceWithPolicyTest.java | 2 +- .../src/test/java/org/apache/camel/issues/AdviceWithTransactedTest.java | 2 +- .../org/apache/camel/issues/TransactedPropertyPlaceholderIssueTest.java | 2 +- .../camel-core/src/test/java/org/apache/camel/model/XmlTestSupport.java | 2 +- .../camel/processor/BeanRecipientListInterfaceAnnotationTest.java | 2 +- .../java/org/apache/camel/processor/CustomProcessorFactoryTest.java | 2 +- .../apache/camel/processor/errorhandler/ErrorHandlerSupportTest.java| 2 +- .../processor/exceptionpolicy/DefaultExceptionPolicyStrategyTest.java | 2 +- .../src/test/java/org/apache/camel/reifier/ProcessorReifierTest.java| 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanExchangeAsReturnTypeNotAllowedTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanExchangeAsReturnTypeNotAllowedTest.java index 989ac24..ee6f867 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanExchangeAsReturnTypeNotAllowedTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanExchangeAsReturnTypeNotAllowedTest.java @@ -52,7 +52,7 @@ public class BeanExchangeAsReturnTypeNotAllowedTest extends ContextTestSupport { return answer; } -@Override +@Override protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { public void configure() throws Exception { diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanImplicitMethodTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanImplicitMethodTest.java index 1b8c6f6..35f39cd 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanImplicitMethodTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanImplicitMethodTest.java @@ -51,7 +51,7 @@ public class BeanImplicitMethodTest extends ContextTestSupport { return answer; } -public static class MyBean { +public static class MyBean { public Integer intRequest(Integer request) { return request; diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanReturnCallableReturnNullTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanReturnCallableReturnNullTest.java index c4ed584..3d47bbf 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanReturnCallableReturnNullTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanReturnCallableReturnNullTest.java @@ -46,7 +46,7 @@ public class BeanReturnCallableReturnNullTest extends ContextTestSupport { return answer; } -@Override +@Override protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { public void configure() throws Exception { diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanReturnCallableTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanReturnCallableTest.java index 8c89aee..67205be 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanReturnCallableTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanReturnCallableTest.java @@ -44,7 +44,7 @@ public class BeanReturnCallableTest extends ContextTestSupport { return answer; } -@Override +@Override protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { public void
[GitHub] [camel-quarkus] oscerd commented on issue #844: Duplicate LICENSE(.txt) and NOTICE(.txt) files in the source distribution
oscerd commented on issue #844: Duplicate LICENSE(.txt) and NOTICE(.txt) files in the source distribution URL: https://github.com/apache/camel-quarkus/issues/844#issuecomment-594536066 It should come from the apache parent pom and pass through the release profile This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] gnodet commented on issue #844: Duplicate LICENSE(.txt) and NOTICE(.txt) files in the source distribution
gnodet commented on issue #844: Duplicate LICENSE(.txt) and NOTICE(.txt) files in the source distribution URL: https://github.com/apache/camel-quarkus/issues/844#issuecomment-594535614 I don't know, i just unzipped the source distribution that was being voted. I don't see any maven assembly plugin though, it may be inherited from the apache parent pom. @oscerd any idea as you did the release ? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel-website] branch master updated: fix: allow XHR access to Algolia servers
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git The following commit(s) were added to refs/heads/master by this push: new d3a0baa fix: allow XHR access to Algolia servers d3a0baa is described below commit d3a0baa51dfd801d5d76082e0686497d9c5ca7f1 Author: Zoran Regvart AuthorDate: Wed Mar 4 14:51:00 2020 +0100 fix: allow XHR access to Algolia servers This tweaks the Content Security Policy to allow XHR access to https://*.algolia.net https://*.algolianet.com. --- static/.htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/.htaccess b/static/.htaccess index 1098df2..ec4e332 100644 --- a/static/.htaccess +++ b/static/.htaccess @@ -1323,7 +1323,7 @@ AddDefaultCharset utf-8 # (1) (2) (3) (4) (5) -Header set Content-Security-Policy "default-src 'self'; base-uri 'none'; form-action 'self'; frame-ancestors 'none'; upgrade-insecure-requests" "expr=%{CONTENT_TYPE} =~ m#text/html#i" +Header set Content-Security-Policy "default-src 'self'; base-uri 'none'; form-action 'self'; frame-ancestors 'none'; upgrade-insecure-requests; connect-src https://*.algolia.net https://*.algolianet.com; "expr=%{CONTENT_TYPE} =~ m#text/html#i" # --
[camel-website] branch asf-site updated: test: fix search
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 2b1ea1c test: fix search 2b1ea1c is described below commit 2b1ea1c3c42d87bc9e9945357a1c7a007aa69412 Author: Zoran Regvart AuthorDate: Wed Mar 4 14:47:20 2020 +0100 test: fix search Trying to see if this CSP policy will allow XHR requests to Algolia servers. --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 1098df2..ec4e332 100644 --- a/.htaccess +++ b/.htaccess @@ -1323,7 +1323,7 @@ AddDefaultCharset utf-8 # (1) (2) (3) (4) (5) -Header set Content-Security-Policy "default-src 'self'; base-uri 'none'; form-action 'self'; frame-ancestors 'none'; upgrade-insecure-requests" "expr=%{CONTENT_TYPE} =~ m#text/html#i" +Header set Content-Security-Policy "default-src 'self'; base-uri 'none'; form-action 'self'; frame-ancestors 'none'; upgrade-insecure-requests; connect-src https://*.algolia.net https://*.algolianet.com; "expr=%{CONTENT_TYPE} =~ m#text/html#i" # --
[camel] branch master updated: CAMEL-14640: Upgrade jackson
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new bfc9ab9 CAMEL-14640: Upgrade jackson bfc9ab9 is described below commit bfc9ab92d1d797741d81b5497b4ae7bc70d80bd7 Author: Claus Ibsen AuthorDate: Wed Mar 4 14:40:44 2020 +0100 CAMEL-14640: Upgrade jackson --- components/camel-spark/pom.xml | 4 ++-- parent/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/camel-spark/pom.xml b/components/camel-spark/pom.xml index 6d4389f..0d07ae7 100644 --- a/components/camel-spark/pom.xml +++ b/components/camel-spark/pom.xml @@ -96,12 +96,12 @@ com.fasterxml.jackson.core jackson-databind -${jackson-spark-version}.1 +${jackson-spark-version} com.fasterxml.jackson.module jackson-module-scala_2.11 -${jackson-spark-version}.1 +${jackson-spark-version} diff --git a/parent/pom.xml b/parent/pom.xml index b77db09..6d359fd 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -312,7 +312,7 @@ 1.1 2.4.0 1.9.12 -2.6.7 +2.10.3 2.10.3 2.21.0 1.2.154_2
[camel] branch master updated: CAMEL-14640: Upgrade guava
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new deeda64 CAMEL-14640: Upgrade guava deeda64 is described below commit deeda64750a23ffda9ef27b5cb08e3695d5aa70b Author: Claus Ibsen AuthorDate: Wed Mar 4 14:36:37 2020 +0100 CAMEL-14640: Upgrade guava --- components/camel-flink/pom.xml | 12 components/camel-ignite/pom.xml | 24 components/camel-spark/pom.xml | 12 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/components/camel-flink/pom.xml b/components/camel-flink/pom.xml index 56704e5..d6842a2 100644 --- a/components/camel-flink/pom.xml +++ b/components/camel-flink/pom.xml @@ -106,6 +106,18 @@ com.google.truth truth test + + +com.google.guava +guava + + + + +com.google.guava +guava +28.2-jre +test org.apache.logging.log4j diff --git a/components/camel-ignite/pom.xml b/components/camel-ignite/pom.xml index 7d767f2..2b126a3 100644 --- a/components/camel-ignite/pom.xml +++ b/components/camel-ignite/pom.xml @@ -90,28 +90,4 @@ - - -jdk9+-build - -[9,) - - - -xalan -xalan - - - - - -maven-surefire-plugin - ---add-opens java.base/jdk.internal.misc=ALL-UNNAMED - - - - - - diff --git a/components/camel-spark/pom.xml b/components/camel-spark/pom.xml index 32304f2..6d4389f 100644 --- a/components/camel-spark/pom.xml +++ b/components/camel-spark/pom.xml @@ -183,6 +183,18 @@ com.google.truth truth test + + +com.google.guava +guava + + + + +com.google.guava +guava +28.2-jre +test org.apache.camel
[GitHub] [camel-quarkus] carlosthe19916 commented on a change in pull request #835: Camel-freemarker component
carlosthe19916 commented on a change in pull request #835: Camel-freemarker component URL: https://github.com/apache/camel-quarkus/pull/835#discussion_r387663697 ## File path: extensions/freemarker/deployment/src/main/java/org/apache/camel/quarkus/component/freemarker/deployment/FreemarkerNativeImageProcessor.java ## @@ -0,0 +1,136 @@ +/* + * 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.freemarker.deployment; + +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.file.FileSystem; +import java.nio.file.FileSystems; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem; +import org.apache.camel.quarkus.component.freemarker.CamelFreemarkerConfig; +import org.apache.commons.io.FilenameUtils; +import org.jboss.logging.Logger; + +class FreemarkerNativeImageProcessor { +private static final String CLASSPATH_APPLICATION_MIGRATIONS_PROTOCOL = "classpath"; +private static final String JAR_APPLICATION_MIGRATIONS_PROTOCOL = "jar"; +private static final String FILE_APPLICATION_MIGRATIONS_PROTOCOL = "file"; + +private static final Logger LOGGER = Logger.getLogger(FreemarkerNativeImageProcessor.class); + +@BuildStep(loadsApplicationClasses = true) +void build( +BuildProducer resourceProducer, +CamelFreemarkerConfig camelFreemarkerConfig) throws IOException, URISyntaxException { +registerNativeImageResources(resourceProducer, camelFreemarkerConfig); +} + +private void registerNativeImageResources( +BuildProducer resource, +CamelFreemarkerConfig camelFreemarkerConfig) throws IOException, URISyntaxException { +List templates = discoverFreemarkerTemplates(camelFreemarkerConfig); +final List nativeResources = new ArrayList<>(templates); +resource.produce(new NativeImageResourceBuildItem(nativeResources.toArray(new String[0]))); +} + +private List discoverFreemarkerTemplates( +CamelFreemarkerConfig camelFreemarkerConfig) throws IOException, URISyntaxException { +List resources = new ArrayList<>(); +try { +List locations = new ArrayList<>(camelFreemarkerConfig.locations); +if (locations.isEmpty()) { +locations.add("freemarker/templates"); +} + +// Locations can be a comma separated list +for (String location : locations) { +// Strip any 'classpath:' protocol prefixes because they are assumed +// but not recognized by ClassLoader.getResources() +if (location != null && location.startsWith(CLASSPATH_APPLICATION_MIGRATIONS_PROTOCOL + ':')) { Review comment: my mistake, it shouldn't be possible to have null values since it comes from `CamelFreemarkerConfig` This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] carlosthe19916 commented on a change in pull request #835: Camel-freemarker component
carlosthe19916 commented on a change in pull request #835: Camel-freemarker component URL: https://github.com/apache/camel-quarkus/pull/835#discussion_r387662659 ## File path: extensions/freemarker/deployment/src/main/java/org/apache/camel/quarkus/component/freemarker/deployment/FreemarkerNativeImageProcessor.java ## @@ -0,0 +1,136 @@ +/* + * 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.freemarker.deployment; + +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.file.FileSystem; +import java.nio.file.FileSystems; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem; +import org.apache.camel.quarkus.component.freemarker.CamelFreemarkerConfig; +import org.apache.commons.io.FilenameUtils; +import org.jboss.logging.Logger; + +class FreemarkerNativeImageProcessor { +private static final String CLASSPATH_APPLICATION_MIGRATIONS_PROTOCOL = "classpath"; +private static final String JAR_APPLICATION_MIGRATIONS_PROTOCOL = "jar"; +private static final String FILE_APPLICATION_MIGRATIONS_PROTOCOL = "file"; + +private static final Logger LOGGER = Logger.getLogger(FreemarkerNativeImageProcessor.class); + +@BuildStep(loadsApplicationClasses = true) +void build( +BuildProducer resourceProducer, +CamelFreemarkerConfig camelFreemarkerConfig) throws IOException, URISyntaxException { +registerNativeImageResources(resourceProducer, camelFreemarkerConfig); Review comment: Thanks for the good advice, I'll do it inline just like you suggested :) This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] carlosthe19916 commented on a change in pull request #835: Camel-freemarker component
carlosthe19916 commented on a change in pull request #835: Camel-freemarker component URL: https://github.com/apache/camel-quarkus/pull/835#discussion_r387661984 ## File path: extensions/freemarker/deployment/src/main/java/org/apache/camel/quarkus/component/freemarker/deployment/FreemarkerProcessor.java ## @@ -0,0 +1,54 @@ +/* + * 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.freemarker.deployment; + +import freemarker.ext.jython.JythonModel; +import freemarker.ext.jython.JythonWrapper; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; +import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; +import org.apache.camel.Exchange; +import org.apache.camel.support.DefaultExchange; + +class FreemarkerProcessor { +private static final String FEATURE = "camel-freemarker"; + +@BuildStep +FeatureBuildItem feature() { +return new FeatureBuildItem(FEATURE); +} + +@BuildStep +RuntimeInitializedClassBuildItem jythonModel() { +return new RuntimeInitializedClassBuildItem(JythonModel.class.getCanonicalName()); +} + +@BuildStep +RuntimeInitializedClassBuildItem jythonWrapper() { +return new RuntimeInitializedClassBuildItem(JythonWrapper.class.getCanonicalName()); +} + +@BuildStep +void registerForReflection(BuildProducer reflectiveClass) { +reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, +Exchange.class, Review comment: Yes, adding Exchange for reflection is needed. According to this documentation: [freemarker context](https://camel.apache.org/components/latest/freemarker-component.html#_freemarker_context), it should be possible to use `exchange.properties` in the `.ftl` templates just like this example: https://github.com/carlosthe19916/camel-quarkus/blob/7d45a783e5b27d341b6a07df49b34087f636dad3/integration-tests/freemarker/src/main/resources/org/apache/camel/component/freemarker/example.ftl#L19. Without using reflection for Exchange it won't work. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] carlosthe19916 commented on a change in pull request #835: Camel-freemarker component
carlosthe19916 commented on a change in pull request #835: Camel-freemarker component URL: https://github.com/apache/camel-quarkus/pull/835#discussion_r387659823 ## File path: extensions/freemarker/deployment/src/main/java/org/apache/camel/quarkus/component/freemarker/deployment/FreemarkerProcessor.java ## @@ -0,0 +1,54 @@ +/* + * 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.freemarker.deployment; + +import freemarker.ext.jython.JythonModel; +import freemarker.ext.jython.JythonWrapper; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; +import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; +import org.apache.camel.Exchange; +import org.apache.camel.support.DefaultExchange; + +class FreemarkerProcessor { +private static final String FEATURE = "camel-freemarker"; + +@BuildStep +FeatureBuildItem feature() { +return new FeatureBuildItem(FEATURE); +} + +@BuildStep +RuntimeInitializedClassBuildItem jythonModel() { +return new RuntimeInitializedClassBuildItem(JythonModel.class.getCanonicalName()); +} + +@BuildStep +RuntimeInitializedClassBuildItem jythonWrapper() { +return new RuntimeInitializedClassBuildItem(JythonWrapper.class.getCanonicalName()); +} + +@BuildStep +void registerForReflection(BuildProducer reflectiveClass) { +reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, Review comment: You're right, I'll update that, Thanks :) This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel] 02/02: CAMEL-14640: Upgrade guava
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 88fa4ec16308b3487d1bd1e83d1fd4f39e20f7c4 Author: Claus Ibsen AuthorDate: Wed Mar 4 14:14:19 2020 +0100 CAMEL-14640: Upgrade guava --- components/camel-hbase/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/camel-hbase/pom.xml b/components/camel-hbase/pom.xml index 6a8c870..8b7c38e 100644 --- a/components/camel-hbase/pom.xml +++ b/components/camel-hbase/pom.xml @@ -320,11 +320,10 @@ - com.google.guava guava -14.0.1 +28.2-jre test
[camel] branch master updated (c5d4b22 -> 88fa4ec)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from c5d4b22 Camel-core-engine: Fixed CS new 315677f CAMEL-14640: Remove guava and update hadoop new 88fa4ec CAMEL-14640: Upgrade guava The 2 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: components/camel-hbase/pom.xml | 3 +-- components/camel-spark/pom.xml | 4 parent/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-)
[camel] 01/02: CAMEL-14640: Remove guava and update hadoop
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 315677fce5d272ef0da8f732f96b1d80d5a270d0 Author: Claus Ibsen AuthorDate: Wed Mar 4 14:10:14 2020 +0100 CAMEL-14640: Remove guava and update hadoop --- components/camel-spark/pom.xml | 4 parent/pom.xml | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/components/camel-spark/pom.xml b/components/camel-spark/pom.xml index 6e4101c..32304f2 100644 --- a/components/camel-spark/pom.xml +++ b/components/camel-spark/pom.xml @@ -126,6 +126,10 @@ ${hadoop2-version} +com.google.guava +guava + + log4j log4j diff --git a/parent/pom.xml b/parent/pom.xml index 534bf32..b77db09 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -269,8 +269,8 @@ 3.0 3.0_1 1.2.1_1 -2.7.2_1 -2.7.4 +2.7.7_1 +2.7.7 2.5.0 2.2 2.3
[camel] branch master updated: Camel-core-engine: Fixed CS
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new c5d4b22 Camel-core-engine: Fixed CS c5d4b22 is described below commit c5d4b22a6bbdf2053dc514ff6882d1574e33fbef Author: Andrea Cosentino AuthorDate: Wed Mar 4 14:09:21 2020 +0100 Camel-core-engine: Fixed CS --- .../java/org/apache/camel/reifier/RouteReifier.java | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RouteReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RouteReifier.java index 7f3b270..3936aea 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RouteReifier.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RouteReifier.java @@ -55,6 +55,15 @@ import org.apache.camel.util.ObjectHelper; public class RouteReifier extends ProcessorReifier { +private static final String[] RESERVED_PROPERTIES = new String[] { +Route.ID_PROPERTY, Route.CUSTOM_ID_PROPERTY, Route.PARENT_PROPERTY, +Route.DESCRIPTION_PROPERTY, Route.GROUP_PROPERTY, +Route.REST_PROPERTY}; + +public RouteReifier(CamelContext camelContext, ProcessorDefinition definition) { +super(camelContext, (RouteDefinition) definition); +} + /** * Advices this route with the route builder. * @@ -98,15 +107,6 @@ public class RouteReifier extends ProcessorReifier { return new RouteReifier(camelContext, definition).adviceWith(builder); } -private static final String[] reservedProperties = new String[] { -Route.ID_PROPERTY, Route.CUSTOM_ID_PROPERTY, Route.PARENT_PROPERTY, -Route.DESCRIPTION_PROPERTY, Route.GROUP_PROPERTY, -Route.REST_PROPERTY}; - -public RouteReifier(CamelContext camelContext, ProcessorDefinition definition) { -super(camelContext, (RouteDefinition) definition); -} - @Override public Processor createProcessor() throws Exception { throw new UnsupportedOperationException("Not implemented for RouteDefinition"); @@ -517,7 +517,7 @@ public class RouteReifier extends ProcessorReifier { try { final String key = parseString(prop.getKey()); final String val = parseString(prop.getValue()); -for (String property : reservedProperties) { +for (String property : RESERVED_PROPERTIES) { if (property.equalsIgnoreCase(key)) { throw new IllegalArgumentException("Cannot set route property " + property + " as it is a reserved property"); }
[GitHub] [camel-website] zregvart commented on issue #81: chore: add search
zregvart commented on issue #81: chore: add search URL: https://github.com/apache/camel-website/pull/81#issuecomment-594507869 Work continued on #163. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-website] zregvart closed pull request #81: chore: add search
zregvart closed pull request #81: chore: add search URL: https://github.com/apache/camel-website/pull/81 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel-website] 05/13: update: show no result text on empty search results
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git commit a52620acc9b702d220e4cc57d899a7bba4985b76 Author: nayananga@ubuntu AuthorDate: Sun Mar 1 22:54:04 2020 +0530 update: show no result text on empty search results --- antora-ui-camel/src/js/06-search.js | 36 +--- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/antora-ui-camel/src/js/06-search.js b/antora-ui-camel/src/js/06-search.js index 4560845..2153ef5 100644 --- a/antora-ui-camel/src/js/06-search.js +++ b/antora-ui-camel/src/js/06-search.js @@ -49,21 +49,27 @@ window.addEventListener('load', () => { return data }) .then((data) => { -return ` - - ${Object.keys(data).map((section) => ` -${section} -${data[section].map((hit) => ` - - - ${hit.breadcrumbs} - ${hit.snippet} - - -`).join('')} - `).join('')} - -` +if (Object.entries(data).length === 0 && data.constructor === Object) { + return ` +Nothing Found +` +} else { + return ` + + ${Object.keys(data).map((section) => ` +${section} +${data[section].map((hit) => ` + + + ${hit.breadcrumbs} + ${hit.snippet} + + +`).join('')} + `).join('')} + +` +} }) .then((markup) => { results.innerHTML = markup
[GitHub] [camel-website] zregvart merged pull request #163: Pr/algolia search
zregvart merged pull request #163: Pr/algolia search URL: https://github.com/apache/camel-website/pull/163 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel-website] 01/13: chore: add search
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git commit ef51e20ee855e6689ffef9a6500e7bc9a477ae19 Author: Zoran Regvart AuthorDate: Tue Aug 20 16:37:33 2019 +0200 chore: add search Work in progress, first pass at the Algolia search implementation. --- antora-ui-camel/src/css/header.css | 31 ++- antora-ui-camel/src/js/06-search.js | 69 + antora-ui-camel/src/partials/footer-scripts.hbs | 1 + antora-ui-camel/src/partials/header-content.hbs | 5 ++ 4 files changed, 105 insertions(+), 1 deletion(-) diff --git a/antora-ui-camel/src/css/header.css b/antora-ui-camel/src/css/header.css index 94d3587..6384833 100644 --- a/antora-ui-camel/src/css/header.css +++ b/antora-ui-camel/src/css/header.css @@ -292,10 +292,39 @@ body { white-space: nowrap; } +.navbar-fill { + flex-grow: 1; +} + +.navbar-search { + padding: 0.5rem; + text-align: right; +} + +.navbar-search input { + border: 0; + border-bottom: 1px solid var(--nav-panel-divider-color); + margin-top: 1rem; + padding: 0.3rem 0.5rem 0.3rem 1.7rem; + font-family: Open Sans, sans-serif; + caret-color: #ed8225; + background: no-repeat 0.2rem/1.2rem url(../img/search.svg); +} + +#search_results { + top: 3rem; + background: #fffe; + padding: 0.5rem; + text-align: left; +} + +.results-hidden #search_results { + display: none; +} + .navbar-tools { display: flex; align-items: flex-end; - flex-grow: 1; justify-content: flex-end; line-height: 1.6; padding: 0.5rem; diff --git a/antora-ui-camel/src/js/06-search.js b/antora-ui-camel/src/js/06-search.js new file mode 100644 index 000..c582ea5 --- /dev/null +++ b/antora-ui-camel/src/js/06-search.js @@ -0,0 +1,69 @@ +window.addEventListener('load', () => { + const client = window.algoliasearch('BH4D9OD16A', '16e3a9155a136e4962dc4c206f8278bd') + const index = client.initIndex('apache_camel') + const search = document.querySelector('#search') + const container = search.parentNode + const results = document.querySelector('#search_results') + + function debounce (fn, wait) { +var timeout +return function () { + var context = this + var args = arguments + var later = () => { +timeout = null +fn.apply(context, args) + } + clearTimeout(timeout) + timeout = setTimeout(later, wait) +} + } + + search.addEventListener('keyup', debounce(() => { +if (search.value.trim() === '') { + container.className = 'navbar-search results-hidden' + results.innerHTML = '' + return +} + +index.search(search.value) + .then((results) => { +const hits = results.hits +const data = hits.reduce((data, hit) => { + const d = {} + d.url = hit.url + d.breadcrumbs = Object.values(hit.hierarchy).slice(1).filter((lvl) => lvl !== null).join(' ') + d.snippet = hit._snippetResult.content.value + + const section = hit.hierarchy.lvl0 + data[section] = data[section] || [] + data[section].push(d) + + return data +}, {}) + +return data + }) + .then((data) => { +return ` + + ${Object.keys(data).map((section) => ` +${section} +${data[section].map((hit) => ` + + + ${hit.breadcrumbs} + ${hit.snippet} + + +`).join('')} + `).join('')} + +` + }) + .then((markup) => { +results.innerHTML = markup +container.className = 'navbar-search' + }) + }, 150)) +}) diff --git a/antora-ui-camel/src/partials/footer-scripts.hbs b/antora-ui-camel/src/partials/footer-scripts.hbs index cca6eb8..93a4fa6 100644 --- a/antora-ui-camel/src/partials/footer-scripts.hbs +++ b/antora-ui-camel/src/partials/footer-scripts.hbs @@ -1,5 +1,6 @@ +https://cdn.jsdelivr.net/algoliasearch/3/algoliasearchLite.min.js"> {{> seo-main}} diff --git a/antora-ui-camel/src/partials/header-content.hbs b/antora-ui-camel/src/partials/header-content.hbs index dac81e8..ad1ee47 100644 --- a/antora-ui-camel/src/partials/header-content.hbs +++ b/antora-ui-camel/src/partials/header-content.hbs @@ -30,6 +30,11 @@ {{/withMenuData}} + + + + + https://github.com/apache/camel/; title="Collaborate on GitHub"> https://gitter.im/apache/apache-camel; title="Chat on Gitter">
[camel-website] 04/13: fix: fixed console error when searching
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git commit b13eb7c00058ef5edf30fb2a78a340714b68f7f1 Author: Nayananga Muhandiram AuthorDate: Sun Mar 1 11:47:02 2020 +0530 fix: fixed console error when searching --- antora-ui-camel/src/js/06-search.js | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/antora-ui-camel/src/js/06-search.js b/antora-ui-camel/src/js/06-search.js index c582ea5..4560845 100644 --- a/antora-ui-camel/src/js/06-search.js +++ b/antora-ui-camel/src/js/06-search.js @@ -33,7 +33,11 @@ window.addEventListener('load', () => { const d = {} d.url = hit.url d.breadcrumbs = Object.values(hit.hierarchy).slice(1).filter((lvl) => lvl !== null).join(' ') - d.snippet = hit._snippetResult.content.value + if (hit._snippetResult !== undefined) { +d.snippet = hit._snippetResult.content.value + } else { +d.snippet = '' + } const section = hit.hierarchy.lvl0 data[section] = data[section] || []
[camel-website] 12/13: update: load algloia lite version to reduce load
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 28d79923b37e22244d0a9790bccb225e5ad66a2d Author: Nayananga Muhandiram AuthorDate: Tue Mar 3 22:51:33 2020 +0530 update: load algloia lite version to reduce load --- antora-ui-camel/src/js/vendor/alogliasearch.bundle.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/antora-ui-camel/src/js/vendor/alogliasearch.bundle.js b/antora-ui-camel/src/js/vendor/alogliasearch.bundle.js index 99cc411..4b29c9f 100644 --- a/antora-ui-camel/src/js/vendor/alogliasearch.bundle.js +++ b/antora-ui-camel/src/js/vendor/alogliasearch.bundle.js @@ -1,7 +1,7 @@ ;(function () { 'use strict' - const algoliasearch = require('algoliasearch') + const algoliasearch = require('algoliasearch/lite') window.addEventListener('load', () => { const client = algoliasearch('BH4D9OD16A', '16e3a9155a136e4962dc4c206f8278bd')
[GitHub] [camel-website] zregvart commented on issue #163: Pr/algolia search
zregvart commented on issue #163: Pr/algolia search URL: https://github.com/apache/camel-website/pull/163#issuecomment-594507579 I think we should merge this, it's not perfect but it works. The two outstanding issues are the design polish and having our own data built for the index. The current Algolia index is based on Algolia crawling the website and it doesn't seem to include some pages and it is not 100% accurate. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel-website] 11/13: fix: load algolia search from vendor dir
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 16dd98a21823ba4011725489a6b38e88bcd7988d Author: Nayananga Muhandiram AuthorDate: Tue Mar 3 22:24:41 2020 +0530 fix: load algolia search from vendor dir --- antora-ui-camel/src/js/06-search.js| 89 antora-ui-camel/src/js/vendor/algoliasearch.js | 4 - .../src/js/vendor/alogliasearch.bundle.js | 95 ++ antora-ui-camel/src/partials/footer-scripts.hbs| 4 +- layouts/partials/footer.html | 4 +- 5 files changed, 99 insertions(+), 97 deletions(-) diff --git a/antora-ui-camel/src/js/06-search.js b/antora-ui-camel/src/js/06-search.js deleted file mode 100644 index 803cf5a..000 --- a/antora-ui-camel/src/js/06-search.js +++ /dev/null @@ -1,89 +0,0 @@ -window.addEventListener('load', () => { - const client = window.algoliasearch('BH4D9OD16A', '16e3a9155a136e4962dc4c206f8278bd') - const index = client.initIndex('apache_camel') - const search = document.querySelector('#search') - const container = search.parentNode - const results = document.querySelector('#search_results') - - function debounce (fn, wait) { -var timeout -return function () { - var context = this - var args = arguments - var later = () => { -timeout = null -fn.apply(context, args) - } - clearTimeout(timeout) - timeout = setTimeout(later, wait) -} - } - - search.addEventListener('keyup', debounce((key) => { -if (search.value.trim() === '') { - container.className = 'navbar-search results-hidden' - results.innerHTML = '' - return -} -if (key.which === 27) { - container.className = 'navbar-search results-hidden' - results.innerHTML = '' - return -} -index.search(search.value) - .then((results) => { -const hits = results.hits -const data = hits.reduce((data, hit) => { - const d = {} - d.url = hit.url - d.breadcrumbs = Object.values(hit.hierarchy).slice(1).filter((lvl) => lvl !== null).join(' ') - if (hit._snippetResult !== undefined) { -d.snippet = hit._snippetResult.content.value - } else { -d.snippet = '' - } - - const section = hit.hierarchy.lvl0 - data[section] = data[section] || [] - data[section].push(d) - - return data -}, {}) - -return data - }) - .then((data) => { -if (Object.entries(data).length === 0 && data.constructor === Object) { - return ` -Nothing Found -` -} else { - return ` - - ${Object.keys(data).map((section) => ` -${section} -${data[section].map((hit) => ` - - - ${hit.breadcrumbs} - ${hit.snippet} - - -`).join('')} - `).join('')} - -` -} - }) - .then((markup) => { -results.innerHTML = markup -container.className = 'navbar-search' - }) - }, 150)) - window.addEventListener('mouseup', debounce((element) => { -if (element.target !== container && element.target.parentNode !== container) { - container.className = 'navbar-search results-hidden' - results.innerHTML = '' -} - }), 150) -}) diff --git a/antora-ui-camel/src/js/vendor/algoliasearch.js b/antora-ui-camel/src/js/vendor/algoliasearch.js deleted file mode 100644 index cf1b6c9..000 --- a/antora-ui-camel/src/js/vendor/algoliasearch.js +++ /dev/null @@ -1,4 +0,0 @@ -;(function () { - var algoliasearch = require('algoliasearch') - return algoliasearch() -})() diff --git a/antora-ui-camel/src/js/vendor/alogliasearch.bundle.js b/antora-ui-camel/src/js/vendor/alogliasearch.bundle.js new file mode 100644 index 000..99cc411 --- /dev/null +++ b/antora-ui-camel/src/js/vendor/alogliasearch.bundle.js @@ -0,0 +1,95 @@ +;(function () { + 'use strict' + + const algoliasearch = require('algoliasearch') + + window.addEventListener('load', () => { +const client = algoliasearch('BH4D9OD16A', '16e3a9155a136e4962dc4c206f8278bd') +const index = client.initIndex('apache_camel') +const search = document.querySelector('#search') +const container = search.parentNode +const results = document.querySelector('#search_results') + +function debounce (fn, wait) { + var timeout + return function () { +var context = this +var args = arguments +var later = () => { + timeout = null + fn.apply(context, args) +} +clearTimeout(timeout) +timeout = setTimeout(later, wait) + } +} + +
[camel-website] 07/13: update: hide search results when not on focus
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 31916c0aff4370e3046ff44142e29bbbd796076b Author: nayananga@ubuntu AuthorDate: Mon Mar 2 01:10:36 2020 +0530 update: hide search results when not on focus --- antora-ui-camel/src/js/06-search.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/antora-ui-camel/src/js/06-search.js b/antora-ui-camel/src/js/06-search.js index 30a59f3..a2231f1 100644 --- a/antora-ui-camel/src/js/06-search.js +++ b/antora-ui-camel/src/js/06-search.js @@ -80,10 +80,10 @@ window.addEventListener('load', () => { container.className = 'navbar-search' }) }, 150)) - window.addEventListener('keyup', (key) => { -if (key.which === 27) { + window.addEventListener('mouseup', debounce((element) => { +if (element.target !== container && element.target.parentNode !== container) { container.className = 'navbar-search results-hidden' results.innerHTML = '' } - }) + }), 150) })
[camel-website] branch master updated (d20afc4 -> 7eab48e)
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git. from d20afc4 fix: make sure RC versions are not promoted new ef51e20 chore: add search new 88e37ea new: add search to the hugo pages new 47eb985 update: update cdn link to algolia lite v4 new b13eb7c fix: fixed console error when searching new a52620a update: show no result text on empty search results new 18e683d update: hide results when esc key pressed new 31916c0 update: hide search results when not on focus new 46e5efc update: updated search bar stying new 60beeaf update: search result styling new 2463afc new: move algoliasearch into vendor dir new 16dd98a fix: load algolia search from vendor dir new 28d7992 update: load algloia lite version to reduce load new 7eab48e update: limited 10 hits per search results The 13 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: antora-ui-camel/package.json | 6 +- antora-ui-camel/src/css/header.css | 51 - .../src/js/vendor/alogliasearch.bundle.js | 97 antora-ui-camel/src/partials/footer-scripts.hbs| 1 + antora-ui-camel/src/partials/header-content.hbs| 5 + antora-ui-camel/yarn.lock | 124 + layouts/partials/footer.html | 5 +- layouts/partials/header.html | 5 + package.json | 1 + yarn.lock | 124 + 10 files changed, 414 insertions(+), 5 deletions(-) create mode 100644 antora-ui-camel/src/js/vendor/alogliasearch.bundle.js
[camel-website] 03/13: update: update cdn link to algolia lite v4
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 47eb985009c44665ad86e72558f36071afdb19d5 Author: Nayananga Muhandiram AuthorDate: Thu Feb 27 00:48:46 2020 +0530 update: update cdn link to algolia lite v4 --- antora-ui-camel/src/partials/footer-scripts.hbs | 2 +- layouts/partials/footer.html| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/antora-ui-camel/src/partials/footer-scripts.hbs b/antora-ui-camel/src/partials/footer-scripts.hbs index 93a4fa6..104f5da 100644 --- a/antora-ui-camel/src/partials/footer-scripts.hbs +++ b/antora-ui-camel/src/partials/footer-scripts.hbs @@ -1,6 +1,6 @@ -https://cdn.jsdelivr.net/algoliasearch/3/algoliasearchLite.min.js"> +https://cdn.jsdelivr.net/npm/algoliasearch@4/dist/algoliasearch-lite.umd.js"> {{> seo-main}} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 35f2f28..064581c 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -41,7 +41,7 @@ -https://cdn.jsdelivr.net/algoliasearch/3/algoliasearchLite.min.js"> +https://cdn.jsdelivr.net/npm/algoliasearch@4/dist/algoliasearch-lite.umd.js"> {{ partial "seo/main" . }}
[camel-website] 02/13: new: add search to the hugo pages
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 88e37ea732a2b0c0993fba22a323a02bdf280d4d Author: Nayananga Muhandiram AuthorDate: Thu Feb 27 00:00:14 2020 +0530 new: add search to the hugo pages --- layouts/partials/footer.html | 1 + layouts/partials/header.html | 5 + 2 files changed, 6 insertions(+) diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 51620cb..35f2f28 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -41,6 +41,7 @@ +https://cdn.jsdelivr.net/algoliasearch/3/algoliasearchLite.min.js"> {{ partial "seo/main" . }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 618556c..04c146d 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -52,6 +52,11 @@ {{ end }} + + + + + https://github.com/apache/camel/; title="Collaborate on GitHub"> https://gitter.im/apache/apache-camel; title="Chat on Gitter">
[camel-website] 09/13: update: search result styling
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 60beeaff255c0db563b01f72fe1a01c23301d505 Author: nayananga@ubuntu AuthorDate: Mon Mar 2 02:22:33 2020 +0530 update: search result styling --- antora-ui-camel/src/css/header.css | 9 + antora-ui-camel/src/js/06-search.js | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/antora-ui-camel/src/css/header.css b/antora-ui-camel/src/css/header.css index 3cd0d76..864e9bb 100644 --- a/antora-ui-camel/src/css/header.css +++ b/antora-ui-camel/src/css/header.css @@ -329,6 +329,15 @@ body { box-shadow: 0.1px 0.2em 2.5em #c4c4c4; } +.result_header { + font-weight: 600; +} + +.result_summary { + padding: 0.5rem; + color: black; +} + .results-hidden #search_results { display: none; } diff --git a/antora-ui-camel/src/js/06-search.js b/antora-ui-camel/src/js/06-search.js index a2231f1..803cf5a 100644 --- a/antora-ui-camel/src/js/06-search.js +++ b/antora-ui-camel/src/js/06-search.js @@ -65,8 +65,8 @@ window.addEventListener('load', () => { ${data[section].map((hit) => ` - ${hit.breadcrumbs} - ${hit.snippet} + ${hit.breadcrumbs} + ${hit.snippet} `).join('')}
[camel-website] 13/13: update: limited 10 hits per search results
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 7eab48e2bc3cb5d32d53fcdf440643d665ce109f Author: Nayananga Muhandiram AuthorDate: Tue Mar 3 23:27:06 2020 +0530 update: limited 10 hits per search results --- antora-ui-camel/src/js/vendor/alogliasearch.bundle.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/antora-ui-camel/src/js/vendor/alogliasearch.bundle.js b/antora-ui-camel/src/js/vendor/alogliasearch.bundle.js index 4b29c9f..7aa53c5 100644 --- a/antora-ui-camel/src/js/vendor/alogliasearch.bundle.js +++ b/antora-ui-camel/src/js/vendor/alogliasearch.bundle.js @@ -35,7 +35,9 @@ results.innerHTML = '' return } - index.search(search.value) + index.search(search.value, { +hitsPerPage: 10, + }) .then((results) => { const hits = results.hits const data = hits.reduce((data, hit) => {
[camel-website] 08/13: update: updated search bar stying
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 46e5efc568a19c44c9d5d06bd089bbad20eae50e Author: nayananga@ubuntu AuthorDate: Mon Mar 2 01:53:17 2020 +0530 update: updated search bar stying --- antora-ui-camel/src/css/header.css | 11 +++ 1 file changed, 11 insertions(+) diff --git a/antora-ui-camel/src/css/header.css b/antora-ui-camel/src/css/header.css index 6384833..3cd0d76 100644 --- a/antora-ui-camel/src/css/header.css +++ b/antora-ui-camel/src/css/header.css @@ -311,11 +311,22 @@ body { background: no-repeat 0.2rem/1.2rem url(../img/search.svg); } +.navbar-search input:focus-within { + transform: scale(1.025); + border-bottom: 1px solid #ed8225; + + @media screen and (prefers-reduced-motion: reduce) { +box-shadow: none; +transform: none; + } +} + #search_results { top: 3rem; background: #fffe; padding: 0.5rem; text-align: left; + box-shadow: 0.1px 0.2em 2.5em #c4c4c4; } .results-hidden #search_results {
[camel-website] 10/13: new: move algoliasearch into vendor dir
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 2463afc77ed8fc3f472f85b57a6f93cbce6cd731 Author: Nayananga Muhandiram AuthorDate: Tue Mar 3 07:59:57 2020 +0530 new: move algoliasearch into vendor dir --- antora-ui-camel/package.json| 6 +- antora-ui-camel/src/js/vendor/algoliasearch.js | 4 + antora-ui-camel/src/partials/footer-scripts.hbs | 4 +- antora-ui-camel/yarn.lock | 124 layouts/partials/footer.html| 6 +- package.json| 1 + yarn.lock | 124 7 files changed, 262 insertions(+), 7 deletions(-) diff --git a/antora-ui-camel/package.json b/antora-ui-camel/package.json index 27a923e..791cca6 100644 --- a/antora-ui-camel/package.json +++ b/antora-ui-camel/package.json @@ -18,6 +18,7 @@ "preview": "gulp preview" }, "devDependencies": { +"@openfonts/open-sans_latin-ext": "^1.44.0", "asciidoctor.js": "1.5.9", "autoprefixer": "~9.6", "browser-pack-flat": "~3.4", @@ -60,7 +61,6 @@ "svg4everybody": "^2.1.9", "through2": "~3.0", "typeface-droid-sans-mono": "^0.0.44", -"@openfonts/open-sans_latin-ext": "^1.44.0", "undertaker": "~1.2", "vinyl-buffer": "~1.0", "vinyl-fs": "~3.0" @@ -71,5 +71,7 @@ "installConfig": { "pnp": true }, - "dependencies": {} + "dependencies": { +"algoliasearch": "^4.0.3" + } } diff --git a/antora-ui-camel/src/js/vendor/algoliasearch.js b/antora-ui-camel/src/js/vendor/algoliasearch.js new file mode 100644 index 000..cf1b6c9 --- /dev/null +++ b/antora-ui-camel/src/js/vendor/algoliasearch.js @@ -0,0 +1,4 @@ +;(function () { + var algoliasearch = require('algoliasearch') + return algoliasearch() +})() diff --git a/antora-ui-camel/src/partials/footer-scripts.hbs b/antora-ui-camel/src/partials/footer-scripts.hbs index 104f5da..bf8ea5d 100644 --- a/antora-ui-camel/src/partials/footer-scripts.hbs +++ b/antora-ui-camel/src/partials/footer-scripts.hbs @@ -1,6 +1,6 @@ - -https://cdn.jsdelivr.net/npm/algoliasearch@4/dist/algoliasearch-lite.umd.js"> + + {{> seo-main}} diff --git a/antora-ui-camel/yarn.lock b/antora-ui-camel/yarn.lock index d9acc25..a2ed4c9 100644 --- a/antora-ui-camel/yarn.lock +++ b/antora-ui-camel/yarn.lock @@ -2,6 +2,110 @@ # yarn lockfile v1 +"@algolia/cache-browser-local-storage@4.0.3": + version "4.0.3" + resolved "https://registry.yarnpkg.com/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.0.3.tgz#17db602aeeb7e50427617d176e2b5191eccedaff; + integrity sha512-iHzUP7ZP09Cd48aAu58OnERchgdho/5l12YoL70AXLeDmyu/ZTENuGHiSwM2NHFE+nM4naH0N9krxtVf3/5HSg== + dependencies: +"@algolia/cache-common" "4.0.3" + +"@algolia/cache-common@4.0.3": + version "4.0.3" + resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.0.3.tgz#a30c786153353487ae19ebac9a448e67a060d801; + integrity sha512-5XwhDpT3bxbLc/NRJayNN7Yfj9UrqZERKjcwv2D1nl3DFa55St9czspbU9XaDns3NhyPY5XipBYJEafWa8NtVA== + +"@algolia/cache-in-memory@4.0.3": + version "4.0.3" + resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.0.3.tgz#52e8733dd7fe994c601b10ba84940ae8d044bed4; + integrity sha512-2eiyV+2oYbpErHNKzcITblVuw2K0qVyFfWxpSQVg5TUWg+PrEfvxAa3oDpcFvkvw/E4lIdvwt2AG8e5ldI11qQ== + dependencies: +"@algolia/cache-common" "4.0.3" + +"@algolia/client-account@4.0.3": + version "4.0.3" + resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.0.3.tgz#6f7d9dc9922b32d38fd694c05d4a2a65878cad0d; + integrity sha512-qMdMD746HjzqGUH+M5yDdinPzDwLK7HSLoyfZqCDaqZD4oxhI0pwvwyTnrSQ+LngWe9wMhu/l+uhipo0libilA== + dependencies: +"@algolia/client-common" "4.0.3" +"@algolia/client-search" "4.0.3" +"@algolia/transporter" "4.0.3" + +"@algolia/client-analytics@4.0.3": + version "4.0.3" + resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.0.3.tgz#760bb7573b9e8fc0baaef54096031ef72071158c; + integrity sha512-y9J6iWowtvc5iKarIYi9FJC7QJJ0y06vvZI8Pa6UC99KyGEosxHiw8vVSlcWdz48nVbDpqvszD/ocpnU1eoGFQ== + dependencies: +"@algolia/client-common" "4.0.3" +"@algolia/client-search" "4.0.3" +"@algolia/requester-common" "4.0.3" +"@algolia/transporter" "4.0.3" + +"@algolia/client-common@4.0.3": + version "4.0.3" + resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.0.3.tgz#786bc4f76d6942c57a26220fc1ac4c600182a23a; + integrity sha512-pAuPT0LH/k0HB1ZfNBbfylPApruVenxn1EZWYDJcuEWkXe8yde+rTOA1355C6M2oz8khEYxKHoCckGUlz6WKSw== + dependencies: +"@algolia/requester-common" "4.0.3" +"@algolia/transporter" "4.0.3" + +"@algolia/client-recommendation@4.0.3": + version "4.0.3" + resolved
[camel-website] 06/13: update: hide results when esc key pressed
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 18e683d3eed01186e3526239c8b7cb709e44bbac Author: nayananga@ubuntu AuthorDate: Mon Mar 2 00:42:24 2020 +0530 update: hide results when esc key pressed --- antora-ui-camel/src/js/06-search.js | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/antora-ui-camel/src/js/06-search.js b/antora-ui-camel/src/js/06-search.js index 2153ef5..30a59f3 100644 --- a/antora-ui-camel/src/js/06-search.js +++ b/antora-ui-camel/src/js/06-search.js @@ -19,13 +19,17 @@ window.addEventListener('load', () => { } } - search.addEventListener('keyup', debounce(() => { + search.addEventListener('keyup', debounce((key) => { if (search.value.trim() === '') { container.className = 'navbar-search results-hidden' results.innerHTML = '' return } - +if (key.which === 27) { + container.className = 'navbar-search results-hidden' + results.innerHTML = '' + return +} index.search(search.value) .then((results) => { const hits = results.hits @@ -76,4 +80,10 @@ window.addEventListener('load', () => { container.className = 'navbar-search' }) }, 150)) + window.addEventListener('keyup', (key) => { +if (key.which === 27) { + container.className = 'navbar-search results-hidden' + results.innerHTML = '' +} + }) })
[camel] 02/02: Camel-AWS2-DDB: Fixed CS
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 1661762b7e2c3d52e9bfa6c10d574ea6fca4d47e Author: Andrea Cosentino AuthorDate: Wed Mar 4 13:57:26 2020 +0100 Camel-AWS2-DDB: Fixed CS --- .../apache/camel/component/aws2/ddb/DeleteTableCommandTest.java| 4 ++-- .../apache/camel/component/aws2/ddb/DescribeTableCommandTest.java | 4 ++-- .../org/apache/camel/component/aws2/ddb/GetItemCommandTest.java| 4 ++-- .../org/apache/camel/component/aws2/ddb/PutItemCommandTest.java| 4 ++-- .../java/org/apache/camel/component/aws2/ddb/QueryCommandTest.java | 4 ++-- .../java/org/apache/camel/component/aws2/ddb/ScanCommandTest.java | 4 ++-- .../org/apache/camel/component/aws2/ddb/UpdateItemCommandTest.java | 4 ++-- .../apache/camel/component/aws2/ddb/UpdateTableCommandTest.java| 2 +- .../aws2/ddb/integration/DdbComponentIntegrationTest.java | 1 - .../aws2/ddbstream/DdbStreamComponentConfigurationTest.java| 7 +++ 10 files changed, 18 insertions(+), 20 deletions(-) diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DeleteTableCommandTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DeleteTableCommandTest.java index f6e4ada..713bd18 100644 --- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DeleteTableCommandTest.java +++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DeleteTableCommandTest.java @@ -19,11 +19,11 @@ package org.apache.camel.component.aws2.ddb; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.DefaultExchange; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughputDescription; import software.amazon.awssdk.services.dynamodb.model.TableStatus; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; public class DeleteTableCommandTest { diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DescribeTableCommandTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DescribeTableCommandTest.java index e7fa20b..cfce85d 100644 --- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DescribeTableCommandTest.java +++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DescribeTableCommandTest.java @@ -22,11 +22,11 @@ import java.util.List; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.DefaultExchange; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement; import software.amazon.awssdk.services.dynamodb.model.TableStatus; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; public class DescribeTableCommandTest { diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/GetItemCommandTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/GetItemCommandTest.java index 59280ec..9d642e1 100644 --- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/GetItemCommandTest.java +++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/GetItemCommandTest.java @@ -24,10 +24,10 @@ import java.util.Map; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.DefaultExchange; -import software.amazon.awssdk.services.dynamodb.model.AttributeValue; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import software.amazon.awssdk.services.dynamodb.model.AttributeValue; + import static org.junit.jupiter.api.Assertions.assertEquals; public class GetItemCommandTest { diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/PutItemCommandTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/PutItemCommandTest.java index 4949ec4..fa8c082 100644 --- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/PutItemCommandTest.java +++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/PutItemCommandTest.java @@ -22,11 +22,11 @@ import java.util.Map; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.DefaultExchange; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test;
[camel] 01/02: Camel-AWS2-DDB: Migrated tests to Junit5
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit a7f2ae7b36ecc61ca7789c869442cbee415c9c17 Author: Andrea Cosentino AuthorDate: Wed Mar 4 13:52:11 2020 +0100 Camel-AWS2-DDB: Migrated tests to Junit5 --- components/camel-aws2-ddb/pom.xml | 7 +-- .../component/aws2/ddb/BatchGetItemsCommandTest.java | 8 .../component/aws2/ddb/DdbComponentConfigurationTest.java | 6 -- .../aws2/ddb/DdbComponentRegistryClientTest.java | 15 +-- .../aws2/ddb/DdbComponentVerifierExtensionTest.java | 11 ++- .../camel/component/aws2/ddb/DeleteItemCommandTest.java | 8 .../camel/component/aws2/ddb/DeleteTableCommandTest.java | 8 .../component/aws2/ddb/DescribeTableCommandTest.java | 8 .../camel/component/aws2/ddb/GetItemCommandTest.java | 8 .../camel/component/aws2/ddb/PutItemCommandTest.java | 8 .../apache/camel/component/aws2/ddb/QueryCommandTest.java | 8 .../apache/camel/component/aws2/ddb/ScanCommandTest.java | 8 .../camel/component/aws2/ddb/UpdateItemCommandTest.java | 8 .../camel/component/aws2/ddb/UpdateTableCommandTest.java | 8 .../aws2/ddb/integration/DdbComponentIntegrationTest.java | 12 .../ddbstream/DdbStreamComponentConfigurationTest.java| 7 +-- .../DdbStreamComponentVerifierExtensionTest.java | 11 ++- 17 files changed, 79 insertions(+), 70 deletions(-) diff --git a/components/camel-aws2-ddb/pom.xml b/components/camel-aws2-ddb/pom.xml index ff86ed4..8f4739a 100644 --- a/components/camel-aws2-ddb/pom.xml +++ b/components/camel-aws2-ddb/pom.xml @@ -53,13 +53,8 @@ -junit -junit -test - - org.apache.camel -camel-test-spring +camel-test-spring-junit5 test diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/BatchGetItemsCommandTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/BatchGetItemsCommandTest.java index 7695234..3143725 100644 --- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/BatchGetItemsCommandTest.java +++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/BatchGetItemsCommandTest.java @@ -23,12 +23,12 @@ import java.util.Map; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.DefaultExchange; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; import software.amazon.awssdk.services.dynamodb.model.KeysAndAttributes; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class BatchGetItemsCommandTest { @@ -37,7 +37,7 @@ public class BatchGetItemsCommandTest { private Ddb2Configuration configuration; private Exchange exchange; -@Before +@BeforeEach public void setUp() { ddbClient = new AmazonDDBClientMock(); configuration = new Ddb2Configuration(); diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentConfigurationTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentConfigurationTest.java index 4ca5775..c6263b9 100644 --- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentConfigurationTest.java +++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentConfigurationTest.java @@ -16,11 +16,13 @@ */ package org.apache.camel.component.aws2.ddb; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class DdbComponentConfigurationTest extends CamelTestSupport { @Test diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentRegistryClientTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentRegistryClientTest.java index 375f68d..d593e08 100644 --- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentRegistryClientTest.java +++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentRegistryClientTest.java @@ -16,8 +16,11
[camel] branch master updated (0e0ae23 -> 1661762)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 0e0ae23 Polished new a7f2ae7 Camel-AWS2-DDB: Migrated tests to Junit5 new 1661762 Camel-AWS2-DDB: Fixed CS The 2 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: components/camel-aws2-ddb/pom.xml | 7 +-- .../component/aws2/ddb/BatchGetItemsCommandTest.java | 8 .../component/aws2/ddb/DdbComponentConfigurationTest.java | 6 -- .../aws2/ddb/DdbComponentRegistryClientTest.java | 15 +-- .../aws2/ddb/DdbComponentVerifierExtensionTest.java | 11 ++- .../camel/component/aws2/ddb/DeleteItemCommandTest.java | 8 .../camel/component/aws2/ddb/DeleteTableCommandTest.java | 8 .../component/aws2/ddb/DescribeTableCommandTest.java | 8 .../camel/component/aws2/ddb/GetItemCommandTest.java | 8 .../camel/component/aws2/ddb/PutItemCommandTest.java | 8 .../apache/camel/component/aws2/ddb/QueryCommandTest.java | 8 .../apache/camel/component/aws2/ddb/ScanCommandTest.java | 8 .../camel/component/aws2/ddb/UpdateItemCommandTest.java | 8 .../camel/component/aws2/ddb/UpdateTableCommandTest.java | 8 .../aws2/ddb/integration/DdbComponentIntegrationTest.java | 11 +++ .../ddbstream/DdbStreamComponentConfigurationTest.java| 6 -- .../DdbStreamComponentVerifierExtensionTest.java | 11 ++- 17 files changed, 77 insertions(+), 70 deletions(-)
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 0e0ae23 Polished 0e0ae23 is described below commit 0e0ae23dc52d5206f9d907514970108c89452b4e Author: Claus Ibsen AuthorDate: Wed Mar 4 13:56:45 2020 +0100 Polished --- .../src/main/java/org/apache/camel/spi/LifecycleStrategy.java | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/LifecycleStrategy.java b/core/camel-api/src/main/java/org/apache/camel/spi/LifecycleStrategy.java index 5a6e247..20ddeaa 100644 --- a/core/camel-api/src/main/java/org/apache/camel/spi/LifecycleStrategy.java +++ b/core/camel-api/src/main/java/org/apache/camel/spi/LifecycleStrategy.java @@ -112,16 +112,16 @@ public interface LifecycleStrategy { void onRoutesRemove(Collection routes); /** - * Notification on adding {@link Route}(s). + * Notification on creating {@link Route}(s). * - * @param route the added route context + * @param route the created route context */ void onRouteContextCreate(Route route); /** * Notification on adding error handler. * - * @param routethe added route context + * @param route the added route context * @param errorHandlerthe error handler * @param errorHandlerBuilder the error handler builder */ @@ -130,7 +130,7 @@ public interface LifecycleStrategy { /** * Notification on removing error handler. * - * @param routethe removed route context + * @param route the removed route context * @param errorHandlerthe error handler * @param errorHandlerBuilder the error handler builder */
[camel] 02/02: Camel-AWS2-CW: Fixed CS
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit a21a95d3e406799845d8ed3ef2b3e12bd67e3c77 Author: Andrea Cosentino AuthorDate: Wed Mar 4 13:36:35 2020 +0100 Camel-AWS2-CW: Fixed CS --- .../camel/component/aws2/cw/CwComponentConfigurationTest.java | 6 +++--- .../camel/component/aws2/cw/CwComponentRegistryClientTest.java | 4 ++-- .../java/org/apache/camel/component/aws2/cw/CwComponentTest.java| 1 - .../camel/component/aws2/cw/CwComponentVerifierExtensionTest.java | 1 + .../component/aws2/cw/integration/CwComponentIntegrationTest.java | 1 - 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentConfigurationTest.java b/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentConfigurationTest.java index 922993b..1def63d 100644 --- a/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentConfigurationTest.java +++ b/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentConfigurationTest.java @@ -19,11 +19,11 @@ package org.apache.camel.component.aws2.cw; import java.time.Instant; import org.apache.camel.BindToRegistry; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.cloudwatch.CloudWatchClient; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -68,7 +68,7 @@ public class CwComponentConfigurationTest extends CamelTestSupport { public void createEndpointWithoutSecretKeyAndAccessKeyConfiguration() throws Exception { Cw2Component component = context.getComponent("aws2-cw", Cw2Component.class); assertThrows(IllegalArgumentException.class, () -> { - component.createEndpoint("aws2-cw://camel.apache.org/test?accessKey=xxx"); + component.createEndpoint("aws2-cw://camel.apache.org/test?accessKey=xxx"); }); } diff --git a/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentRegistryClientTest.java b/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentRegistryClientTest.java index 5055fbf..5f25dbf 100644 --- a/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentRegistryClientTest.java +++ b/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentRegistryClientTest.java @@ -21,8 +21,8 @@ import java.time.Instant; import org.apache.camel.BindToRegistry; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; - import software.amazon.awssdk.services.cloudwatch.CloudWatchClient; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -49,7 +49,7 @@ public class CwComponentRegistryClientTest extends CamelTestSupport { public void createEndpointWithMinimalS3ClientMisconfiguration() throws Exception { Cw2Component component = context.getComponent("aws2-cw", Cw2Component.class); assertThrows(IllegalArgumentException.class, () -> { -Cw2Endpoint endpoint = (Cw2Endpoint)component.createEndpoint("aws2-cw://camel.apache.org/test"); +Cw2Endpoint endpoint = (Cw2Endpoint)component.createEndpoint("aws2-cw://camel.apache.org/test"); }); } } diff --git a/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentTest.java b/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentTest.java index 42b622a..e76680e 100644 --- a/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentTest.java +++ b/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentTest.java @@ -26,7 +26,6 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; - import software.amazon.awssdk.services.cloudwatch.CloudWatchClient; import software.amazon.awssdk.services.cloudwatch.model.StandardUnit; diff --git a/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentVerifierExtensionTest.java b/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentVerifierExtensionTest.java index 6073b71..69cebe4 100644 ---
[GitHub] [camel-quarkus] ppalaga commented on issue #844: Duplicate LICENSE(.txt) and NOTICE(.txt) files in the source distribution
ppalaga commented on issue #844: Duplicate LICENSE(.txt) and NOTICE(.txt) files in the source distribution URL: https://github.com/apache/camel-quarkus/issues/844#issuecomment-594495544 I mean, how do I build the source distro? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel] branch master updated (2f0cc02 -> a21a95d)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 2f0cc02 Upgrade Async http client to version 2.11.0 new 8f62239 Camel-AWS2-CW: Migrated tests to Junit5 new a21a95d Camel-AWS2-CW: Fixed CS The 2 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: components/camel-aws2-cw/pom.xml | 7 +- .../aws2/cw/CwComponentConfigurationTest.java | 25 +++--- .../aws2/cw/CwComponentRegistryClientTest.java | 13 +++ .../camel/component/aws2/cw/CwComponentTest.java | 4 ++-- .../aws2/cw/CwComponentVerifierExtensionTest.java | 11 +- .../cw/integration/CwComponentIntegrationTest.java | 8 +++ 6 files changed, 39 insertions(+), 29 deletions(-)
[camel] 01/02: Camel-AWS2-CW: Migrated tests to Junit5
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 8f622392de3348850b0350b707b5edf7d05c5987 Author: Andrea Cosentino AuthorDate: Wed Mar 4 13:25:58 2020 +0100 Camel-AWS2-CW: Migrated tests to Junit5 --- components/camel-aws2-cw/pom.xml | 7 +-- .../aws2/cw/CwComponentConfigurationTest.java | 23 +++--- .../aws2/cw/CwComponentRegistryClientTest.java | 11 --- .../camel/component/aws2/cw/CwComponentTest.java | 5 +++-- .../aws2/cw/CwComponentVerifierExtensionTest.java | 10 +- .../cw/integration/CwComponentIntegrationTest.java | 9 + 6 files changed, 38 insertions(+), 27 deletions(-) diff --git a/components/camel-aws2-cw/pom.xml b/components/camel-aws2-cw/pom.xml index 28fd553..30d58b4 100644 --- a/components/camel-aws2-cw/pom.xml +++ b/components/camel-aws2-cw/pom.xml @@ -53,13 +53,8 @@ -junit -junit -test - - org.apache.camel -camel-test-spring +camel-test-spring-junit5 test diff --git a/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentConfigurationTest.java b/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentConfigurationTest.java index 6f8e169..922993b 100644 --- a/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentConfigurationTest.java +++ b/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentConfigurationTest.java @@ -19,11 +19,14 @@ package org.apache.camel.component.aws2.cw; import java.time.Instant; import org.apache.camel.BindToRegistry; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.cloudwatch.CloudWatchClient; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class CwComponentConfigurationTest extends CamelTestSupport { @@ -45,22 +48,28 @@ public class CwComponentConfigurationTest extends CamelTestSupport { assertEquals(NOW, endpoint.getConfiguration().getTimestamp()); } -@Test(expected = IllegalArgumentException.class) +@Test public void createEndpointWithoutAccessKeyConfiguration() throws Exception { Cw2Component component = context.getComponent("aws2-cw", Cw2Component.class); - component.createEndpoint("aws2-cw://camel.apache.org/test?secretKey=yyy"); +assertThrows(IllegalArgumentException.class, () -> { + component.createEndpoint("aws2-cw://camel.apache.org/test?secretKey=yyy"); +}); } -@Test(expected = IllegalArgumentException.class) +@Test public void createEndpointWithoutSecretKeyConfiguration() throws Exception { Cw2Component component = context.getComponent("aws2-cw", Cw2Component.class); - component.createEndpoint("aws2-cw://camel.apache.org/test?accessKey=xxx"); +assertThrows(IllegalArgumentException.class, () -> { + component.createEndpoint("aws2-cw://camel.apache.org/test?accessKey=xxx"); +}); } -@Test(expected = IllegalArgumentException.class) +@Test public void createEndpointWithoutSecretKeyAndAccessKeyConfiguration() throws Exception { Cw2Component component = context.getComponent("aws2-cw", Cw2Component.class); +assertThrows(IllegalArgumentException.class, () -> { component.createEndpoint("aws2-cw://camel.apache.org/test?accessKey=xxx"); +}); } @Test diff --git a/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentRegistryClientTest.java b/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentRegistryClientTest.java index 69814f1..5055fbf 100644 --- a/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentRegistryClientTest.java +++ b/components/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentRegistryClientTest.java @@ -19,9 +19,12 @@ package org.apache.camel.component.aws2.cw; import java.time.Instant; import org.apache.camel.BindToRegistry; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + import software.amazon.awssdk.services.cloudwatch.CloudWatchClient; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows;
[GitHub] [camel-quarkus] ppalaga commented on issue #844: Duplicate LICENSE(.txt) and NOTICE(.txt) files in the source distribution
ppalaga commented on issue #844: Duplicate LICENSE(.txt) and NOTICE(.txt) files in the source distribution URL: https://github.com/apache/camel-quarkus/issues/844#issuecomment-594494670 @gnodet could you please sketch how did you find this issue? I have an idea where the problem is but I'd like to make sure that my fix will meet your acceptance criteria. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel-quarkus] 02/02: Fix since versions on various places
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 014697fe9ba98699d3bf6352a1547a9d3d737f0b Author: Peter Palaga AuthorDate: Wed Mar 4 12:38:45 2020 +0100 Fix since versions on various places --- docs/modules/ROOT/pages/extensions/ahc.adoc| 2 +- docs/modules/ROOT/pages/extensions/http.adoc | 2 +- docs/modules/ROOT/pages/extensions/sql.adoc| 2 +- .../pages/list-of-camel-quarkus-extensions.adoc| 36 +++--- extensions/azure/runtime/pom.xml | 2 +- extensions/bindy/runtime/pom.xml | 2 +- extensions/box/runtime/pom.xml | 2 +- extensions/gson/runtime/pom.xml| 2 +- extensions/ical/runtime/pom.xml| 2 +- extensions/jira/runtime/pom.xml| 2 +- extensions/johnzon/runtime/pom.xml | 2 +- extensions/lzf/runtime/pom.xml | 2 +- extensions/olingo4/runtime/pom.xml | 2 +- extensions/readme.adoc | 36 +++--- extensions/stream/runtime/pom.xml | 2 +- extensions/support/policy/runtime/pom.xml | 2 +- extensions/telegram/runtime/pom.xml| 2 +- extensions/websocket-jsr356/runtime/pom.xml| 2 +- extensions/xpath/runtime/pom.xml | 2 +- extensions/zip-deflater/runtime/pom.xml| 2 +- 20 files changed, 54 insertions(+), 54 deletions(-) diff --git a/docs/modules/ROOT/pages/extensions/ahc.adoc b/docs/modules/ROOT/pages/extensions/ahc.adoc index 8ea06a3..45fc877 100644 --- a/docs/modules/ROOT/pages/extensions/ahc.adoc +++ b/docs/modules/ROOT/pages/extensions/ahc.adoc @@ -1,7 +1,7 @@ [[ahc]] = Async HTTP Client (AHC) Extension -*Since Camel Quarkus 1.0.0* +*Since Camel Quarkus 1.0.0-M3* The AHC component provides HTTP based endpoints for consuming external HTTP resources (as a client to call external servers using HTTP). It is using the https://github.com/AsyncHttpClient/async-http-client[Async Http Client library] diff --git a/docs/modules/ROOT/pages/extensions/http.adoc b/docs/modules/ROOT/pages/extensions/http.adoc index 06ac77c..f48099a 100644 --- a/docs/modules/ROOT/pages/extensions/http.adoc +++ b/docs/modules/ROOT/pages/extensions/http.adoc @@ -1,7 +1,7 @@ [[http]] = HTTP Extension -*Since Camel Quarkus 1.0.0* +*Since Camel Quarkus 1.0.0-M3* The HTTP component provides HTTP based endpoints for calling external HTTP resources (as a client to call external servers using HTTP). diff --git a/docs/modules/ROOT/pages/extensions/sql.adoc b/docs/modules/ROOT/pages/extensions/sql.adoc index a1d89a3..e596ea9 100644 --- a/docs/modules/ROOT/pages/extensions/sql.adoc +++ b/docs/modules/ROOT/pages/extensions/sql.adoc @@ -1,7 +1,7 @@ [[sql]] = SQL Extension -*Since Camel Quarkus 1.1.0* +*Since Camel Quarkus 1.0.0-M2* The SQL component allows you to work with databases using JDBC queries. diff --git a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc index 3914027..bc90dd6 100644 --- a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc +++ b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc @@ -67,10 +67,10 @@ Number of Camel components: 71 in 61 JAR artifacts (0 deprecated) `aws-translate:label` | 1.0.0-M3 | The aws-translate component is used for managing Amazon Translate | link:https://camel.apache.org/components/latest/azure-blob-component.html[Azure Storage Blob Service] (camel-quarkus-azure) + -`azure-blob:containerOrBlobUri` | 1.2.0 | The azure-blob component is used for storing and retrieving blobs from Azure Storage Blob Service. +`azure-blob:containerOrBlobUri` | 1.0.0-M4 | The azure-blob component is used for storing and retrieving blobs from Azure Storage Blob Service. | link:https://camel.apache.org/components/latest/azure-queue-component.html[Azure Storage Queue Service] (camel-quarkus-azure) + -`azure-queue:containerAndQueueUri` | 1.2.0 | The azure-queue component is used for storing and retrieving messages from Azure Storage Queue Service. +`azure-queue:containerAndQueueUri` | 1.0.0-M4 | The azure-queue component is used for storing and retrieving messages from Azure Storage Queue Service. | link:https://camel.apache.org/components/latest/bean-component.html[Bean] (camel-quarkus-bean) + `bean:beanName` | 0.2.0 | The bean component is for invoking Java beans from Camel. @@ -79,7 +79,7 @@ Number of Camel components: 71 in 61 JAR artifacts (0 deprecated) `bean-validator:label` | 1.0.0-M1 | The Validator component performs bean validation of the message body using the Java Bean Validation API. | link:https://camel.apache.org/components/latest/box-component.html[Box]
[camel-quarkus] branch master updated (2384fe4 -> 014697f)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. from 2384fe4 Regen docs new 0e245b7 The next is 1.0.0-M5 new 014697f Fix since versions on various places The 2 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/pages/extensions/ahc.adoc| 2 +- docs/modules/ROOT/pages/extensions/http.adoc | 2 +- docs/modules/ROOT/pages/extensions/sql.adoc| 2 +- .../pages/list-of-camel-quarkus-extensions.adoc| 36 +++--- extensions/azure/runtime/pom.xml | 2 +- extensions/bindy/runtime/pom.xml | 2 +- extensions/box/runtime/pom.xml | 2 +- extensions/gson/runtime/pom.xml| 2 +- extensions/ical/runtime/pom.xml| 2 +- extensions/jira/runtime/pom.xml| 2 +- extensions/johnzon/runtime/pom.xml | 2 +- extensions/lzf/runtime/pom.xml | 2 +- extensions/olingo4/runtime/pom.xml | 2 +- extensions/readme.adoc | 36 +++--- extensions/stream/runtime/pom.xml | 2 +- extensions/support/policy/runtime/pom.xml | 2 +- extensions/telegram/runtime/pom.xml| 2 +- extensions/websocket-jsr356/runtime/pom.xml| 2 +- extensions/xpath/runtime/pom.xml | 2 +- extensions/zip-deflater/runtime/pom.xml| 2 +- tooling/create-extension-templates/runtime-pom.xml | 2 +- 21 files changed, 55 insertions(+), 55 deletions(-)
[GitHub] [camel-quarkus] ppalaga merged pull request #845: Fix since versions on various places
ppalaga merged pull request #845: Fix since versions on various places URL: https://github.com/apache/camel-quarkus/pull/845 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel-quarkus] 01/02: The next is 1.0.0-M5
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 0e245b7577c9ab278db347008a5223fd55281ec6 Author: Peter Palaga AuthorDate: Wed Mar 4 12:25:51 2020 +0100 The next is 1.0.0-M5 --- tooling/create-extension-templates/runtime-pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/create-extension-templates/runtime-pom.xml b/tooling/create-extension-templates/runtime-pom.xml index c3e8a56..ce84179 100644 --- a/tooling/create-extension-templates/runtime-pom.xml +++ b/tooling/create-extension-templates/runtime-pom.xml @@ -32,7 +32,7 @@ [=namePrefix][=nameBase][=nameSegmentDelimiter]Runtime -[=version?split(".")[0]].[=version?split(".")[1]?number + 1].0 +1.0.0-M5
[GitHub] [camel-quarkus] ppalaga commented on a change in pull request #846: Add AMQP extension
ppalaga commented on a change in pull request #846: Add AMQP extension URL: https://github.com/apache/camel-quarkus/pull/846#discussion_r387624512 ## File path: extensions/amqp/deployment/src/main/java/org/apache/camel/quarkus/component/amqp/deployment/AmqpProcessor.java ## @@ -0,0 +1,81 @@ +/* + * 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.amqp.deployment; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; + +class AmqpProcessor { + +private static final String QPID_JMS_SERRVICE_BASE = "META-INF/services/org/apache/qpid/jms/"; Review comment: SERRVICE looks like a typo This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] ppalaga commented on a change in pull request #846: Add AMQP extension
ppalaga commented on a change in pull request #846: Add AMQP extension URL: https://github.com/apache/camel-quarkus/pull/846#discussion_r387628426 ## File path: extensions/amqp/deployment/src/main/java/org/apache/camel/quarkus/component/amqp/deployment/AmqpProcessor.java ## @@ -0,0 +1,81 @@ +/* + * 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.amqp.deployment; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; + +class AmqpProcessor { + +private static final String QPID_JMS_SERRVICE_BASE = "META-INF/services/org/apache/qpid/jms/"; +private static final String FEATURE = "camel-amqp"; + +@BuildStep +FeatureBuildItem feature() { +return new FeatureBuildItem(FEATURE); +} + +@BuildStep +void registerServiceProviders(BuildProducer reflectiveClass, +BuildProducer nativeImage) { +String[] servicePaths = new String[] { +QPID_JMS_SERRVICE_BASE + "provider/amqp", +QPID_JMS_SERRVICE_BASE + "provider/amqps", +QPID_JMS_SERRVICE_BASE + "provider/amqpws", +QPID_JMS_SERRVICE_BASE + "provider/amqpwss", +QPID_JMS_SERRVICE_BASE + "provider/failover", +QPID_JMS_SERRVICE_BASE + "provider/redirects/ws", +QPID_JMS_SERRVICE_BASE + "provider/redirects/wss", +QPID_JMS_SERRVICE_BASE + "sasl/ANONYMOUS", +QPID_JMS_SERRVICE_BASE + "sasl/CRAM-MD5", +QPID_JMS_SERRVICE_BASE + "sasl/EXTERNAL", +QPID_JMS_SERRVICE_BASE + "sasl/GSSAPI", +QPID_JMS_SERRVICE_BASE + "sasl/SCRAM-SHA-1", +QPID_JMS_SERRVICE_BASE + "sasl/SCRAM-SHA-256", +QPID_JMS_SERRVICE_BASE + "sasl/XOAUTH2", +QPID_JMS_SERRVICE_BASE + "tracing/noop", +QPID_JMS_SERRVICE_BASE + "transports/ssl", +QPID_JMS_SERRVICE_BASE + "transports/tcp", +QPID_JMS_SERRVICE_BASE + "transports/ws", +QPID_JMS_SERRVICE_BASE + "transports/wss", +}; + +for (String path : servicePaths) { +reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, getServiceClass(path))); +} + +nativeImage.produce(new NativeImageResourceBuildItem(servicePaths)); +} + +private String getServiceClass(String servicePath) { +try { +InputStream resource = AmqpProcessor.class.getClassLoader().getResourceAsStream(servicePath); Review comment: The stream does not get closed like this. Could you please put it into a `try()`? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] ppalaga commented on a change in pull request #846: Add AMQP extension
ppalaga commented on a change in pull request #846: Add AMQP extension URL: https://github.com/apache/camel-quarkus/pull/846#discussion_r387629117 ## File path: extensions/amqp/runtime/src/main/java/org/apache/camel/quarkus/component/amqp/graal/QpidJmsSubstitutions.java ## @@ -0,0 +1,50 @@ +/* + * 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.amqp.graal; + +import java.net.URI; + +import javax.net.ssl.SSLEngine; + +import com.oracle.svm.core.annotate.Substitute; +import com.oracle.svm.core.annotate.TargetClass; +import io.netty.buffer.ByteBufAllocator; +import io.netty.handler.ssl.SslContext; +import org.apache.qpid.jms.transports.TransportOptions; + +final class QpidJmsSubstitutions { +} + +@TargetClass(className = "org.apache.qpid.jms.transports.TransportSupport") +final class SubstituteTransportSupport { + +@Substitute +public static boolean isOpenSSLPossible(TransportOptions options) { +return false; Review comment: Would you please add a comment why the OpenSSL support is not possible? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel] branch master updated: Upgrade Async http client to version 2.11.0
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 2f0cc02 Upgrade Async http client to version 2.11.0 2f0cc02 is described below commit 2f0cc020f2e2779d6eeaae9ace79770984554895 Author: Andrea Cosentino AuthorDate: Wed Mar 4 13:12:04 2020 +0100 Upgrade Async http client to version 2.11.0 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index ead5121..534bf32 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -45,7 +45,7 @@ 5.15.11 2.11.0 1.0.2.v20150114 -2.10.5 +2.11.0 1.17 4.1.1.4 1.7.0_6