[GitHub] [camel] zhfeng opened a new pull request, #8763: Upgrade jettison to 1.5.2
zhfeng opened a new pull request, #8763: URL: https://github.com/apache/camel/pull/8763 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: CAMEL-18628: REST DSL: Add option to disable REST endpoints.
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new c01ab899882 CAMEL-18628: REST DSL: Add option to disable REST endpoints. c01ab899882 is described below commit c01ab899882bb2309ed08b8ccf9bcfd9190107eb Author: Claus Ibsen AuthorDate: Wed Nov 23 09:20:57 2022 +0100 CAMEL-18628: REST DSL: Add option to disable REST endpoints. --- .../src/main/java/org/apache/camel/model/rest/RestDefinition.java | 2 +- .../src/main/java/org/apache/camel/model/rest/VerbDefinition.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java index 57c7acad82f..e1220a1157f 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java @@ -62,7 +62,7 @@ public class RestDefinition extends OptionalIdentifiedDefinition private String produces; @XmlAttribute @Metadata(label = "advanced", javaType = "java.lang.Boolean") -protected String disabled; +private String disabled; @XmlAttribute @Metadata(defaultValue = "off", enums = "off,auto,json,xml,json_xml") private String bindingMode; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/VerbDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/VerbDefinition.java index b6fcdb5c427..6a5afdbcfb7 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/VerbDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/VerbDefinition.java @@ -55,7 +55,7 @@ public abstract class VerbDefinition extends OptionalIdentifiedDefinition
[camel] branch regen_bot updated (f981bdc4a13 -> 9046f37e4de)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git omit f981bdc4a13 Regen for commit 2096e03aef6980fd6707c272f7faedc28c026d93 add 9046f37e4de Regen for commit 2096e03aef6980fd6707c272f7faedc28c026d93 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (f981bdc4a13) \ N -- N -- N refs/heads/regen_bot (9046f37e4de) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
[camel] branch main updated: Upgrade to micrometer 1.10.1 and reactor-core upgrade as well.
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 664ad2b9867 Upgrade to micrometer 1.10.1 and reactor-core upgrade as well. 664ad2b9867 is described below commit 664ad2b98670b6892783f431368d44b15bc2954f Author: Claus Ibsen AuthorDate: Wed Nov 23 09:31:54 2022 +0100 Upgrade to micrometer 1.10.1 and reactor-core upgrade as well. --- camel-dependencies/pom.xml | 4 ++-- parent/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 2ec8d253c8a..7cdd0362ac7 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -406,7 +406,7 @@ 3.5.2 3.3.1 4.2.9 -1.9.5 +1.10.1 2.0.1 3.0 3.0.1 @@ -473,7 +473,7 @@ 3.7.4 1.0.4 1.0.2 -3.4.14 +3.4.25 3.16.7 1.7.1 4.5.1 diff --git a/parent/pom.xml b/parent/pom.xml index 95e33781fa5..7568695d1fb 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -392,7 +392,7 @@ 3.5.2 3.3.1 4.2.9 -1.9.5 +1.10.1 2.0.1 3.0.1 3.0 @@ -458,7 +458,7 @@ 3.7.4 3.7.4 1.0.4 -3.4.14 +3.4.25 1.0.2 3.16.7 1.7.1
[camel] branch main updated (664ad2b9867 -> f23b4c54a7a)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 664ad2b9867 Upgrade to micrometer 1.10.1 and reactor-core upgrade as well. new a7664943e4a Upgrade Artemis to version 2.27.0 new f23b4c54a7a Sync deps and regen 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: camel-dependencies/pom.xml | 2 +- .../main/camel-main-configuration-metadata.json| 2 +- .../apache/camel/catalog/schemas/camel-spring.xsd | 24 -- parent/pom.xml | 2 +- 4 files changed, 3 insertions(+), 27 deletions(-)
[camel] 01/02: Upgrade Artemis to version 2.27.0
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit a7664943e4a346da6d37567b95dff5c66292da5b Author: Andrea Cosentino AuthorDate: Wed Nov 23 09:48:57 2022 +0100 Upgrade Artemis to version 2.27.0 Signed-off-by: Andrea Cosentino --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 7568695d1fb..ba92e8bbb9c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -51,7 +51,7 @@ 1.1.3 5.17.2 -2.26.0 +2.27.0 2.0.0.AM26 2.7 1.19.0
[camel] 02/02: Sync deps and regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit f23b4c54a7a6da162eb43d5e4a4d39a551202f46 Author: Andrea Cosentino AuthorDate: Wed Nov 23 09:56:55 2022 +0100 Sync deps and regen Signed-off-by: Andrea Cosentino --- camel-dependencies/pom.xml | 2 +- .../main/camel-main-configuration-metadata.json| 2 +- .../apache/camel/catalog/schemas/camel-spring.xsd | 24 -- 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 7cdd0362ac7..e124b97ce6a 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -34,7 +34,7 @@ Camel Dependencies POM 1.1.3 -2.26.0 +2.27.0 5.17.2 2.7 1.19.0 diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json index b9836b00584..e5a838745fd 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json @@ -196,7 +196,7 @@ { "name": "camel.rest.inlineRoutes", "description": "Inline routes in rest-dsl which are linked using direct endpoints. By default, each service in Rest DSL is an individual route, meaning that you would have at least two routes per service (rest-dsl, and the route linked from rest-dsl). Enabling this allows Camel to optimize and inline this as a single route, however this requires to use direct endpoints, which must be unique per service. This option is default false.", "sourceType" [...] { "name": "camel.rest.jsonDataFormat", "description": "Sets a custom json data format to be used Important: This option is only for setting a custom name of the data format, not to refer to an existing data format instance.", "sourceType": "org.apache.camel.spi.RestConfiguration", "type": "string", "javaType": "java.lang.String" }, { "name": "camel.rest.port", "description": "Sets the port to use by the REST consumer", "sourceType": "org.apache.camel.spi.RestConfiguration", "type": "integer", "javaType": "int" }, -{ "name": "camel.rest.producerApiDoc", "description": "Sets the location of the api document (swagger api) the REST producer will use to validate the REST uri and query parameters are valid accordingly to the api document. This requires adding camel-openapi-java, or camel-swagger-java to the classpath, and any miss configuration will let Camel fail on startup and report the error(s). The location of the api document is loaded from classpath by default, but you can use file: or http: [...] +{ "name": "camel.rest.producerApiDoc", "description": "Sets the location of the api document (swagger api) the REST producer will use to validate the REST uri and query parameters are valid accordingly to the api document. This requires adding camel-swagger-java to the classpath, and any miss configuration will let Camel fail on startup and report the error(s). The location of the api document is loaded from classpath by default, but you can use file: or http: to refer to resources t [...] { "name": "camel.rest.producerComponent", "description": "Sets the name of the Camel component to use as the REST producer", "sourceType": "org.apache.camel.spi.RestConfiguration", "type": "string", "javaType": "java.lang.String" }, { "name": "camel.rest.scheme", "description": "Sets the scheme to use by the REST consumer", "sourceType": "org.apache.camel.spi.RestConfiguration", "type": "string", "javaType": "java.lang.String" }, { "name": "camel.rest.skipBindingOnErrorCode", "description": "Whether to skip binding output if there is a custom HTTP error code, and instead use the response body as-is. This option is default true.", "sourceType": "org.apache.camel.spi.RestConfiguration", "type": "boolean", "javaType": "boolean", "defaultValue": true }, diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd index d50e518ee0d..59f46d616db 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd @@ -21282,18 +21282,6 @@ be configured on a parent level. - - - - - - - - @@ -22456,18 +224
[GitHub] [camel-kamelets] oscerd commented on issue #1173: Kamelet validator prevents @BeanInject usage
oscerd commented on issue #1173: URL: https://github.com/apache/camel-kamelets/issues/1173#issuecomment-1324730082 I don't have strong opininion on this. I would prefer to keep the stuff simple, but relaxing validation for having some more flexibility in relation to beans is fine. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: CAMEL-18628: REST DSL: Add option to disable REST endpoints.
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new dfb4debcfe8 CAMEL-18628: REST DSL: Add option to disable REST endpoints. dfb4debcfe8 is described below commit dfb4debcfe866dfc83f9df21883e2a4932fde72e Author: Claus Ibsen AuthorDate: Wed Nov 23 09:59:41 2022 +0100 CAMEL-18628: REST DSL: Add option to disable REST endpoints. --- .../src/main/java/org/apache/camel/model/rest/RestDefinition.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java index e1220a1157f..fb92dd5c560 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java @@ -744,7 +744,7 @@ public class RestDefinition extends OptionalIdentifiedDefinition // only include enabled verbs List filter = new ArrayList<>(); for (VerbDefinition verb : verbs) { -disabled = CamelContextHelper.parseBoolean(camelContext, verb.disabled); +disabled = CamelContextHelper.parseBoolean(camelContext, verb.getDisabled()); if (disabled == null || !disabled) { filter.add(verb); }
[GitHub] [camel-k] astefanutti merged pull request #3835: fix(GC): Default to APIResourceList group when APIResource group is empty (1.10.x)
astefanutti merged PR #3835: URL: https://github.com/apache/camel-k/pull/3835 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch release-1.10.x updated: fix(GC): Default to APIResourceList group when APIResource group is empty
This is an automated email from the ASF dual-hosted git repository. astefanutti pushed a commit to branch release-1.10.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-1.10.x by this push: new a0628b0e6 fix(GC): Default to APIResourceList group when APIResource group is empty a0628b0e6 is described below commit a0628b0e66d29388373c0baea2ce77b9b2f9626b Author: Antonin Stefanutti AuthorDate: Tue Nov 22 11:19:04 2022 +0100 fix(GC): Default to APIResourceList group when APIResource group is empty --- pkg/trait/gc.go | 15 --- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkg/trait/gc.go b/pkg/trait/gc.go index 755b51b9a..dd4d7dc64 100644 --- a/pkg/trait/gc.go +++ b/pkg/trait/gc.go @@ -221,14 +221,23 @@ func (t *gcTrait) getDeletableTypes(e *Environment) (map[schema.GroupVersionKind GVKs := make(map[schema.GroupVersionKind]struct{}) for _, APIResourceList := range APIResourceLists { for _, resource := range APIResourceList.APIResources { + resourceGroup := resource.Group + if resourceGroup == "" { + // Empty implies the group of the containing resource list should be used + gv, err := schema.ParseGroupVersion(APIResourceList.GroupVersion) + if err != nil { + return nil, err + } + resourceGroup = gv.Group + } rule: for _, rule := range ssrr.Status.ResourceRules { if !util.StringSliceContainsAnyOf(rule.Verbs, "delete", "*") { continue } - for _, group := range rule.APIGroups { - for _, name := range rule.Resources { - if (resource.Group == group || group == "*") && (resource.Name == name || name == "*") { + for _, ruleGroup := range rule.APIGroups { + for _, ruleResource := range rule.Resources { + if (resourceGroup == ruleGroup || ruleGroup == "*") && (resource.Name == ruleResource || ruleResource == "*") { GVK := schema.FromAPIVersionAndKind(APIResourceList.GroupVersion, resource.Kind) GVKs[GVK] = struct{}{} break rule
[camel] branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 868ec4f6452 Regen 868ec4f6452 is described below commit 868ec4f6452209d4f1f319d7962cd3f0b2a89fca Author: Andrea Cosentino AuthorDate: Wed Nov 23 10:22:38 2022 +0100 Regen Signed-off-by: Andrea Cosentino --- .../main/camel-main-configuration-metadata.json| 2 +- .../apache/camel/catalog/schemas/camel-spring.xsd | 24 ++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json index e5a838745fd..b9836b00584 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json @@ -196,7 +196,7 @@ { "name": "camel.rest.inlineRoutes", "description": "Inline routes in rest-dsl which are linked using direct endpoints. By default, each service in Rest DSL is an individual route, meaning that you would have at least two routes per service (rest-dsl, and the route linked from rest-dsl). Enabling this allows Camel to optimize and inline this as a single route, however this requires to use direct endpoints, which must be unique per service. This option is default false.", "sourceType" [...] { "name": "camel.rest.jsonDataFormat", "description": "Sets a custom json data format to be used Important: This option is only for setting a custom name of the data format, not to refer to an existing data format instance.", "sourceType": "org.apache.camel.spi.RestConfiguration", "type": "string", "javaType": "java.lang.String" }, { "name": "camel.rest.port", "description": "Sets the port to use by the REST consumer", "sourceType": "org.apache.camel.spi.RestConfiguration", "type": "integer", "javaType": "int" }, -{ "name": "camel.rest.producerApiDoc", "description": "Sets the location of the api document (swagger api) the REST producer will use to validate the REST uri and query parameters are valid accordingly to the api document. This requires adding camel-swagger-java to the classpath, and any miss configuration will let Camel fail on startup and report the error(s). The location of the api document is loaded from classpath by default, but you can use file: or http: to refer to resources t [...] +{ "name": "camel.rest.producerApiDoc", "description": "Sets the location of the api document (swagger api) the REST producer will use to validate the REST uri and query parameters are valid accordingly to the api document. This requires adding camel-openapi-java, or camel-swagger-java to the classpath, and any miss configuration will let Camel fail on startup and report the error(s). The location of the api document is loaded from classpath by default, but you can use file: or http: [...] { "name": "camel.rest.producerComponent", "description": "Sets the name of the Camel component to use as the REST producer", "sourceType": "org.apache.camel.spi.RestConfiguration", "type": "string", "javaType": "java.lang.String" }, { "name": "camel.rest.scheme", "description": "Sets the scheme to use by the REST consumer", "sourceType": "org.apache.camel.spi.RestConfiguration", "type": "string", "javaType": "java.lang.String" }, { "name": "camel.rest.skipBindingOnErrorCode", "description": "Whether to skip binding output if there is a custom HTTP error code, and instead use the response body as-is. This option is default true.", "sourceType": "org.apache.camel.spi.RestConfiguration", "type": "boolean", "javaType": "boolean", "defaultValue": true }, diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd index 59f46d616db..d50e518ee0d 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd @@ -21282,6 +21282,18 @@ be configured on a parent level. + + + + + + + + @@ -22444,6 +22456,18 @@ be configured on a parent level. + + + + + + + +
[GitHub] [camel] github-actions[bot] commented on pull request #8763: Upgrade jettison to 1.5.2
github-actions[bot] commented on PR #8763: URL: https://github.com/apache/camel/pull/8763#issuecomment-1324774897 :no_entry_sign: There are (likely) no components to be tested in this PR -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch 2.13.x updated: Fix AsciiDoc syntax
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch 2.13.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/2.13.x by this push: new 1c084271fc Fix AsciiDoc syntax 1c084271fc is described below commit 1c084271fc1bdbc977a9860c5a927a7d0fa678b1 Author: Zoran Regvart AuthorDate: Wed Nov 23 10:37:19 2022 +0100 Fix AsciiDoc syntax --- docs/modules/ROOT/pages/reference/extensions/platform-http.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/platform-http.adoc b/docs/modules/ROOT/pages/reference/extensions/platform-http.adoc index 25be1753e9..bed30597c7 100644 --- a/docs/modules/ROOT/pages/reference/extensions/platform-http.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/platform-http.adoc @@ -144,12 +144,12 @@ Platform HTTP component can act as a reverse proxy, in that case `Exchange.HTTP_ Here's an example of a HTTP proxy that simply redirects the Exchange to the origin server. [source,java] --- + from("platform-http:proxy") .toD("http://"; + "${headers." + Exchange.HTTP_HOST + "}"); -- + [id="extensions-platform-http-additional-camel-quarkus-configuration"]
[GitHub] [camel] davsclaus merged pull request #8763: Upgrade jettison to 1.5.2
davsclaus merged PR #8763: URL: https://github.com/apache/camel/pull/8763 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch camel-3.18.x updated: Upgrade jettison to 1.5.2 (#8763)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.18.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-3.18.x by this push: new be1481afe4a Upgrade jettison to 1.5.2 (#8763) be1481afe4a is described below commit be1481afe4a460e4b9392f12ce0d674ba729c888 Author: Zheng Feng AuthorDate: Wed Nov 23 17:44:23 2022 +0800 Upgrade jettison to 1.5.2 (#8763) --- camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 40ecafc1fd3..d42c4439882 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -321,7 +321,7 @@ 2.0 3.7.1 0.5.11 -1.5.1 +1.5.2 ${jetty-version} org.eclipse.jetty ${jetty9-version} diff --git a/parent/pom.xml b/parent/pom.xml index e07868d1a70..830d27293a7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -310,7 +310,7 @@ ${jetty9-version} ${jetty-version} org.eclipse.jetty -1.5.1 +1.5.2 6.1.0.202203080745-r 4.2.17.Final 0.5.3.Final
[camel] branch regen_bot updated (9046f37e4de -> 4c4f5f9452b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 9046f37e4de Regen for commit 2096e03aef6980fd6707c272f7faedc28c026d93 add c01ab899882 CAMEL-18628: REST DSL: Add option to disable REST endpoints. add 664ad2b9867 Upgrade to micrometer 1.10.1 and reactor-core upgrade as well. add a7664943e4a Upgrade Artemis to version 2.27.0 add f23b4c54a7a Sync deps and regen add dfb4debcfe8 CAMEL-18628: REST DSL: Add option to disable REST endpoints. add 4c4f5f9452b Regen for commit dfb4debcfe866dfc83f9df21883e2a4932fde72e No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 6 +++--- .../src/main/java/org/apache/camel/model/rest/RestDefinition.java | 4 ++-- .../src/main/java/org/apache/camel/model/rest/VerbDefinition.java | 2 +- parent/pom.xml | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #8764: Generated sources regen
github-actions[bot] opened a new pull request, #8764: URL: https://github.com/apache/camel/pull/8764 Regen bot :robot: found some uncommitted changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] oscerd merged pull request #8764: Generated sources regen
oscerd merged PR #8764: URL: https://github.com/apache/camel/pull/8764 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main created (now 868ec4f6452)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git at 868ec4f6452 Regen This branch includes the following new commits: new 868ec4f6452 Regen The 1 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.
[camel] 01/01: Regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 868ec4f6452209d4f1f319d7962cd3f0b2a89fca Author: Andrea Cosentino AuthorDate: Wed Nov 23 10:22:38 2022 +0100 Regen Signed-off-by: Andrea Cosentino --- .../main/camel-main-configuration-metadata.json| 2 +- .../apache/camel/catalog/schemas/camel-spring.xsd | 24 ++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json index e5a838745fd..b9836b00584 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json @@ -196,7 +196,7 @@ { "name": "camel.rest.inlineRoutes", "description": "Inline routes in rest-dsl which are linked using direct endpoints. By default, each service in Rest DSL is an individual route, meaning that you would have at least two routes per service (rest-dsl, and the route linked from rest-dsl). Enabling this allows Camel to optimize and inline this as a single route, however this requires to use direct endpoints, which must be unique per service. This option is default false.", "sourceType" [...] { "name": "camel.rest.jsonDataFormat", "description": "Sets a custom json data format to be used Important: This option is only for setting a custom name of the data format, not to refer to an existing data format instance.", "sourceType": "org.apache.camel.spi.RestConfiguration", "type": "string", "javaType": "java.lang.String" }, { "name": "camel.rest.port", "description": "Sets the port to use by the REST consumer", "sourceType": "org.apache.camel.spi.RestConfiguration", "type": "integer", "javaType": "int" }, -{ "name": "camel.rest.producerApiDoc", "description": "Sets the location of the api document (swagger api) the REST producer will use to validate the REST uri and query parameters are valid accordingly to the api document. This requires adding camel-swagger-java to the classpath, and any miss configuration will let Camel fail on startup and report the error(s). The location of the api document is loaded from classpath by default, but you can use file: or http: to refer to resources t [...] +{ "name": "camel.rest.producerApiDoc", "description": "Sets the location of the api document (swagger api) the REST producer will use to validate the REST uri and query parameters are valid accordingly to the api document. This requires adding camel-openapi-java, or camel-swagger-java to the classpath, and any miss configuration will let Camel fail on startup and report the error(s). The location of the api document is loaded from classpath by default, but you can use file: or http: [...] { "name": "camel.rest.producerComponent", "description": "Sets the name of the Camel component to use as the REST producer", "sourceType": "org.apache.camel.spi.RestConfiguration", "type": "string", "javaType": "java.lang.String" }, { "name": "camel.rest.scheme", "description": "Sets the scheme to use by the REST consumer", "sourceType": "org.apache.camel.spi.RestConfiguration", "type": "string", "javaType": "java.lang.String" }, { "name": "camel.rest.skipBindingOnErrorCode", "description": "Whether to skip binding output if there is a custom HTTP error code, and instead use the response body as-is. This option is default true.", "sourceType": "org.apache.camel.spi.RestConfiguration", "type": "boolean", "javaType": "boolean", "defaultValue": true }, diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd index 59f46d616db..d50e518ee0d 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd @@ -21282,6 +21282,18 @@ be configured on a parent level. + + + + + + + + @@ -22444,6 +22456,18 @@ be configured on a parent level. + + + + + + + +
[camel-quarkus] branch camel-main updated (7aea3036ec -> 5b9086c5c7)
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard 7aea3036ec Upgrade Camel to 3.20.0 new 5b9086c5c7 Upgrade Camel to 3.20.0 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (7aea3036ec) \ N -- N -- N refs/heads/camel-main (5b9086c5c7) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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/examples/components/microprofile-metrics.yml | 2 +- .../ROOT/pages/reference/extensions/microprofile-metrics.adoc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
[camel] branch regen_bot updated (4c4f5f9452b -> 868ec4f6452)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git omit 4c4f5f9452b Regen for commit dfb4debcfe866dfc83f9df21883e2a4932fde72e add 868ec4f6452 Regen This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (4c4f5f9452b) \ N -- N -- N refs/heads/regen_bot (868ec4f6452) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
[camel-kamelets] 01/02: Split Makefile in multiple targets (AWS, Misc etc.)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch split-it-tests in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit bd1d3c292050ea084d331dfc218e5778852b006e Author: Andrea Cosentino AuthorDate: Wed Nov 23 11:09:26 2022 +0100 Split Makefile in multiple targets (AWS, Misc etc.) Signed-off-by: Andrea Cosentino --- it-tests/Makefile | 34 -- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/it-tests/Makefile b/it-tests/Makefile index 28336809..f45c1245 100644 --- a/it-tests/Makefile +++ b/it-tests/Makefile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -tests: +all: mkdir -p tests cd aws/aws-s3/source/ && \ ./aws-s3-log-it-test.sh $(camel-version) @@ -38,6 +38,36 @@ tests: cd misc/sftp/sink/ && \ ./timer-sftp-it-test.sh $(camel-version) ./scripts/results.sh + rm -rf tests +aws: + mkdir -p tests + cd aws/aws-s3/source/ && \ + ./aws-s3-log-it-test.sh $(camel-version) + cd aws/aws-s3/sink/ && \ + ./timer-aws-s3-it-test.sh $(camel-version) + cd aws/aws-kinesis/source/ && \ + ./aws-kinesis-log-it-test.sh $(camel-version) + cd aws/aws-kinesis/sink/ && \ + ./timer-aws-kinesis-it-test.sh $(camel-version) + cd aws/aws-sqs/source/ && \ + ./aws-sqs-log-it-test.sh $(camel-version) + cd aws/aws-sqs/sink/ && \ + ./timer-aws-sqs-it-test.sh $(camel-version) + cd aws/aws-sqs-fifo/sink/ && \ + ./timer-aws-sqs-fifo-it-test.sh $(camel-version) + cd aws/aws-sns/sink/ && \ + ./timer-aws-sns-it-test.sh $(camel-version) + cd aws/aws-kinesis-firehose/sink/ && \ + ./timer-aws-kinesis-firehose-it-test.sh $(camel-version) + ./scripts/results.sh + rm -rf tests +misc: + mkdir -p tests + cd misc/sftp/source/ && \ + ./sftp-log-it-test.sh $(camel-version) + cd misc/sftp/sink/ && \ + ./timer-sftp-it-test.sh $(camel-version) + ./scripts/results.sh rm -rf tests -.PHONY: tests clean +.PHONY: all aws misc clean
[camel-kamelets] 02/02: SFTP Source Container it-test: Don't log container id
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch split-it-tests in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit 8fb7a895feea45cff66810992060a119d61ae12d Author: Andrea Cosentino AuthorDate: Wed Nov 23 11:09:51 2022 +0100 SFTP Source Container it-test: Don't log container id Signed-off-by: Andrea Cosentino --- it-tests/misc/sftp/source/sftp-log-it-test.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/it-tests/misc/sftp/source/sftp-log-it-test.sh b/it-tests/misc/sftp/source/sftp-log-it-test.sh index 46560a83..e69eaca3 100755 --- a/it-tests/misc/sftp/source/sftp-log-it-test.sh +++ b/it-tests/misc/sftp/source/sftp-log-it-test.sh @@ -11,8 +11,6 @@ docker pull emberstack/sftp docker run -p 24:22 --name sftp -d emberstack/sftp sftpid=`docker ps -aqf "name=sftp"` -echo $sftpid - jbang run -Dcamel.jbang.version=$camel_version camel@apache/camel run --local-kamelet-dir=../../../../kamelets/ sftp-log.yaml & sleep 10
[camel-kamelets] branch split-it-tests created (now 8fb7a895)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch split-it-tests in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git at 8fb7a895 SFTP Source Container it-test: Don't log container id This branch includes the following new commits: new bd1d3c29 Split Makefile in multiple targets (AWS, Misc etc.) new 8fb7a895 SFTP Source Container it-test: Don't log container id 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.
[camel] branch main updated: Fix AsciiDoc syntax
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 9b144a4ef69 Fix AsciiDoc syntax 9b144a4ef69 is described below commit 9b144a4ef69bea08b2a3af12ab3d2ab40a13d37e Author: Zoran Regvart AuthorDate: Wed Nov 23 11:17:57 2022 +0100 Fix AsciiDoc syntax --- docs/user-manual/modules/ROOT/pages/rest-dsl.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-manual/modules/ROOT/pages/rest-dsl.adoc b/docs/user-manual/modules/ROOT/pages/rest-dsl.adoc index 1e11846bba1..061247a5e1e 100644 --- a/docs/user-manual/modules/ROOT/pages/rest-dsl.adoc +++ b/docs/user-manual/modules/ROOT/pages/rest-dsl.adoc @@ -266,7 +266,7 @@ And in XML: In this example the last two REST endpoints are configured with `disabled`. You can use xref:manual:ROOT:using-propertyplaceholder.adoc[Property Placeholder] to let a external configuration determine if the REST endpoint is disabled or not. -In this example the `/customers/{id}/orders` endpoint is disabled via a placeholder. +In this example the `/customers/\{id}/orders` endpoint is disabled via a placeholder. The last REST endpoint is hardcoded to be disabled. == Binding to POJOs using
[GitHub] [camel-kamelets] oscerd merged pull request #1174: It-Tests Makefile: Add specific targets for different kind of it-tests
oscerd merged PR #1174: URL: https://github.com/apache/camel-kamelets/pull/1174 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kamelets] 02/02: SFTP Source Container it-test: Don't log container id
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit 01421917224bdee246a99ae1c033108b25c46ad1 Author: Andrea Cosentino AuthorDate: Wed Nov 23 11:09:51 2022 +0100 SFTP Source Container it-test: Don't log container id Signed-off-by: Andrea Cosentino --- it-tests/misc/sftp/source/sftp-log-it-test.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/it-tests/misc/sftp/source/sftp-log-it-test.sh b/it-tests/misc/sftp/source/sftp-log-it-test.sh index 46560a83..e69eaca3 100755 --- a/it-tests/misc/sftp/source/sftp-log-it-test.sh +++ b/it-tests/misc/sftp/source/sftp-log-it-test.sh @@ -11,8 +11,6 @@ docker pull emberstack/sftp docker run -p 24:22 --name sftp -d emberstack/sftp sftpid=`docker ps -aqf "name=sftp"` -echo $sftpid - jbang run -Dcamel.jbang.version=$camel_version camel@apache/camel run --local-kamelet-dir=../../../../kamelets/ sftp-log.yaml & sleep 10
[camel-kamelets] 01/02: Split Makefile in multiple targets (AWS, Misc etc.)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit 9e49663a3bfd77b879ad0cbab174785a2e6cc6f9 Author: Andrea Cosentino AuthorDate: Wed Nov 23 11:09:26 2022 +0100 Split Makefile in multiple targets (AWS, Misc etc.) Signed-off-by: Andrea Cosentino --- it-tests/Makefile | 34 -- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/it-tests/Makefile b/it-tests/Makefile index 28336809..f45c1245 100644 --- a/it-tests/Makefile +++ b/it-tests/Makefile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -tests: +all: mkdir -p tests cd aws/aws-s3/source/ && \ ./aws-s3-log-it-test.sh $(camel-version) @@ -38,6 +38,36 @@ tests: cd misc/sftp/sink/ && \ ./timer-sftp-it-test.sh $(camel-version) ./scripts/results.sh + rm -rf tests +aws: + mkdir -p tests + cd aws/aws-s3/source/ && \ + ./aws-s3-log-it-test.sh $(camel-version) + cd aws/aws-s3/sink/ && \ + ./timer-aws-s3-it-test.sh $(camel-version) + cd aws/aws-kinesis/source/ && \ + ./aws-kinesis-log-it-test.sh $(camel-version) + cd aws/aws-kinesis/sink/ && \ + ./timer-aws-kinesis-it-test.sh $(camel-version) + cd aws/aws-sqs/source/ && \ + ./aws-sqs-log-it-test.sh $(camel-version) + cd aws/aws-sqs/sink/ && \ + ./timer-aws-sqs-it-test.sh $(camel-version) + cd aws/aws-sqs-fifo/sink/ && \ + ./timer-aws-sqs-fifo-it-test.sh $(camel-version) + cd aws/aws-sns/sink/ && \ + ./timer-aws-sns-it-test.sh $(camel-version) + cd aws/aws-kinesis-firehose/sink/ && \ + ./timer-aws-kinesis-firehose-it-test.sh $(camel-version) + ./scripts/results.sh + rm -rf tests +misc: + mkdir -p tests + cd misc/sftp/source/ && \ + ./sftp-log-it-test.sh $(camel-version) + cd misc/sftp/sink/ && \ + ./timer-sftp-it-test.sh $(camel-version) + ./scripts/results.sh rm -rf tests -.PHONY: tests clean +.PHONY: all aws misc clean
[camel-kamelets] branch main updated (66c29ad3 -> 01421917)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git from 66c29ad3 Updated CHANGELOG.md new 9e49663a Split Makefile in multiple targets (AWS, Misc etc.) new 01421917 SFTP Source Container it-test: Don't log container id 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: it-tests/Makefile | 34 +-- it-tests/misc/sftp/source/sftp-log-it-test.sh | 2 -- 2 files changed, 32 insertions(+), 4 deletions(-)
[camel-kamelets] branch regen_bot updated (c3f880dd -> 01421917)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git from c3f880dd SCP connector missing authentication options to use a private key add 66c29ad3 Updated CHANGELOG.md add 9e49663a Split Makefile in multiple targets (AWS, Misc etc.) add 01421917 SFTP Source Container it-test: Don't log container id No new revisions were added by this update. Summary of changes: CHANGELOG.md | 7 ++ it-tests/Makefile | 34 +-- it-tests/misc/sftp/source/sftp-log-it-test.sh | 2 -- 3 files changed, 39 insertions(+), 4 deletions(-)
[GitHub] [camel-kamelets] oscerd closed issue #1149: IT Tests: make terraform configuration more stable
oscerd closed issue #1149: IT Tests: make terraform configuration more stable URL: https://github.com/apache/camel-kamelets/issues/1149 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] phantomjinx commented on pull request #3824: chore(e2e): segregate flaky tests from common,install ITs
phantomjinx commented on PR #3824: URL: https://github.com/apache/camel-k/pull/3824#issuecomment-1324881204 Hey @tadayosi Sorry for the late comment. I like the idea and in fact there is a "PROBLEMATIC" comment already applied to a number of the tests. When a switch is turned on (midstream OCP test suite has this on by default), these tests are listed and skipped. So we can certainly improve on that as its a little clunky. My concern is that over the course of the last 8-10 months of executing the tests midstream, the failures can be completely random. Some tests do fail more often than others but sometimes inexplicably the `upgrade` tests fail or the `binding` tests in `common`. Rerunning those tests the following morning and all is good. I do not have a solution for this at this time. Accepting that most of the time the midstream test suite shows "red" after a full run has become the norm. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (868ec4f6452 -> 9b144a4ef69)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 868ec4f6452 Regen add 9b144a4ef69 Fix AsciiDoc syntax No new revisions were added by this update. Summary of changes: docs/user-manual/modules/ROOT/pages/rest-dsl.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[GitHub] [camel] orpiske commented on pull request #8757: Backport to 3.18 a few Kafka fixes
orpiske commented on PR #8757: URL: https://github.com/apache/camel/pull/8757#issuecomment-1324898977 Checkstyle issue is unrelated to 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske merged pull request #8757: Backport to 3.18 a few Kafka fixes
orpiske merged PR #8757: URL: https://github.com/apache/camel/pull/8757 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch camel-3.18.x updated: CAMEL-18717: do save to offset repository when using a commit manager
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch camel-3.18.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-3.18.x by this push: new 8112c11a339 CAMEL-18717: do save to offset repository when using a commit manager 8112c11a339 is described below commit 8112c11a339f0ec434d7dd77e7475c9c46630a4b Author: Otavio Rodolfo Piske AuthorDate: Mon Nov 21 15:09:44 2022 +0100 CAMEL-18717: do save to offset repository when using a commit manager --- .../kafka/consumer/AbstractCommitManager.java | 20 ++ .../kafka/consumer/AsyncCommitManager.java | 18 - .../kafka/consumer/CommitToOffsetManager.java | 20 -- .../kafka/consumer/SyncCommitManager.java | 12 +++- .../integration/BaseManualCommitTestSupport.java | 80 - .../KafkaConsumerAsyncWithOffsetRepoCommitIT.java | 81 ++ .../KafkaConsumerSyncWithOffsetRepoCommitIT.java | 72 +++ 7 files changed, 265 insertions(+), 38 deletions(-) diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/AbstractCommitManager.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/AbstractCommitManager.java index 6b1b3dd4d5d..fe5abc3e403 100644 --- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/AbstractCommitManager.java +++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/AbstractCommitManager.java @@ -91,4 +91,24 @@ public abstract class AbstractCommitManager implements CommitManager { Duration.ofMillis(timeout)); } +protected void saveStateToOffsetRepository( +TopicPartition partition, long partitionLastOffset, +StateRepository offsetRepository) { + +if (LOG.isDebugEnabled()) { +LOG.debug("Saving offset repository state {} [topic: {} partition: {} offset: {}]", threadId, partition.topic(), +partition.partition(), +partitionLastOffset); +} +offsetRepository.setState(serializeOffsetKey(partition), serializeOffsetValue(partitionLastOffset)); +} + +protected static String serializeOffsetKey(TopicPartition topicPartition) { +return topicPartition.topic() + '/' + topicPartition.partition(); +} + +protected static String serializeOffsetValue(long offset) { +return String.valueOf(offset); +} + } diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/AsyncCommitManager.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/AsyncCommitManager.java index d05778bdaa9..7e117ee4d61 100644 --- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/AsyncCommitManager.java +++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/AsyncCommitManager.java @@ -22,6 +22,7 @@ import java.util.Map; import org.apache.camel.Exchange; import org.apache.camel.component.kafka.KafkaConsumer; +import org.apache.camel.spi.StateRepository; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.OffsetAndMetadata; @@ -34,11 +35,14 @@ public class AsyncCommitManager extends AbstractCommitManager { private final Consumer consumer; private final OffsetCache offsetCache = new OffsetCache(); +private final StateRepository offsetRepository; public AsyncCommitManager(Consumer consumer, KafkaConsumer kafkaConsumer, String threadId, String printableTopic) { super(consumer, kafkaConsumer, threadId, printableTopic); this.consumer = consumer; + +offsetRepository = configuration.getOffsetRepository(); } @Override @@ -66,7 +70,7 @@ public class AsyncCommitManager extends AbstractCommitManager { final Map topicPartitionOffsetAndMetadataMap = Collections.singletonMap(partition, new OffsetAndMetadata(partitionLastOffset + 1)); -consumer.commitAsync(topicPartitionOffsetAndMetadataMap, offsetCache::removeCommittedEntries); +consumer.commitAsync(topicPartitionOffsetAndMetadataMap, this::postCommitCallback); } @Override @@ -85,4 +89,16 @@ public class AsyncCommitManager extends AbstractCommitManager { public void recordOffset(TopicPartition partition, long partitionLastOffset) { offsetCache.recordOffset(partition, partitionLastOffset); } + +private void postCommitCallback(Map committed, Exception exception) { +if (exception == null) { +if (offsetRepository != null) { +for (var entry : committed.entrySet()) { +saveStateToOffsetRepository(entry.getKey(), entry.getValue().offset(
[GitHub] [camel-website] zregvart merged pull request #926: Refine the text for the mailing list page
zregvart merged PR #926: URL: https://github.com/apache/camel-website/pull/926 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-website] branch main updated: Refine the text for the mailing list page
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-website.git The following commit(s) were added to refs/heads/main by this push: new e789ff79 Refine the text for the mailing list page e789ff79 is described below commit e789ff79c1d998f2143e6568bfb645cdf55fe0c9 Author: Zoran Regvart AuthorDate: Tue Nov 22 13:38:20 2022 +0100 Refine the text for the mailing list page Seems that folk are confused about mailing list, this adds a bit more text to the mailing list page, hopefully this might help. --- content/community/mailing-list.md | 27 --- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/content/community/mailing-list.md b/content/community/mailing-list.md index 34d58719..f9fbd728 100644 --- a/content/community/mailing-list.md +++ b/content/community/mailing-list.md @@ -2,15 +2,29 @@ title: "Mailing Lists" --- -## Use Camel User List +## Read this first before posting -You should post and subscribe to the Camel User List for all your questions on using Camel, or how to do X with Camel etc. If in doubt use this list. -The Camel Developer List, is for the Camel team to discus development of the actual Camel project; do not use this list for questions on using Camel. -Again to re-iterate, use the Camel User List, for your Camel questions. This is the correct mailing list, and has the most people there ready for helping you. +### Which email list to use? -## Post plain text mails +To send an email to the mailing list you need to subscribe first by sending an email to the Subscribe email address listed below. If you do not wish to receive any more emails send a message to the Unsubscribe email address listed below. If you do not subscribe to the mailing list your email will be sent to the moderation queue and most likely it will be rejected. You will not receive email responses sent directly to the mailing list on the topic you raised unless you are subscribed. -When posting to the mailing lists, use plain text mails. Do not use HTML mails. HTML mails is more likely to be targeted as spam mails and will be rejected; as well it's not easily readable by others. +If you want to discuss using Apache Camel please use the Users mailing list. Appropriate discussions for the Users' mailing list are questions or problems you encounter using Apache Camel, for example, “How do I…”. If in doubt use the Users' mailing list. + +If you wish to discuss contributing to Apache Camel please use the Developer mailing list. Do not discuss using Apache Camel on the Developers' mailing list. + +The Commits and Issues mailing lists contain automated messages on changes to the source code or issue trackers, do not write to those mailing lists. + +Again to re-iterate, use the User List, for your Camel questions. This is the correct mailing list and has the most people there ready for helping you. + +Sometimes it might be more appropriate to chat, and for that use the [Zulip chat](https://camel.zulipchat.com/). For other means of getting support see [Community support](/community/support/) and [Commercial Camel offerings](/manual/commercial-camel-offerings.html). + +### Post plain text mails + +When posting to the mailing lists, use plain text mail. Do not use HTML mail. HTML mail is more likely to be targeted as spam mail and will be rejected; as well it’s not easily readable by others. Attachments, such as images, source code files, or project archives cannot be sent to the mailing lists, if you need to send an attachment upload it to a file/image-sharing website first and include the link to it in your message. + +### Mailing list addresses + +Be sure to subscribe first to the mailing list of choice before sending an email to the list. {{< table >}} | List Name | Address | Subscribe | Unsubscribe | Archive | Comment | @@ -20,4 +34,3 @@ When posting to the mailing lists, use plain text mails. Do not use HTML mails. | Camel Commits List | commits@camel.apache.org | [subscribe](mailto:commits-subscr...@camel.apache.org) | [unsubscribe](mailto:commits-unsubscr...@camel.apache.org) | [Archives](https://lists.apache.org/list.html?commits@camel.apache.org) | Notifications on changes to the Camel code | | Camel Issues List | iss...@camel.apache.org | [subscribe](mailto:issues-subscr...@camel.apache.org) | [unsubscribe](mailto:issues-unsubscr...@camel.apache.org) | [Archives](https://lists.apache.org/list.html?iss...@camel.apache.org) | Notifications of JIRA issues | {{< /table >}} -
[GitHub] [camel-website] github-actions[bot] commented on pull request #926: Refine the text for the mailing list page
github-actions[bot] commented on PR #926: URL: https://github.com/apache/camel-website/pull/926#issuecomment-1324923117 🚀 Preview is available at https://pr-926--camel.netlify.app -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] klease opened a new pull request, #8765: CAMEL-18707: upgrade to Jandex 3
klease opened a new pull request, #8765: URL: https://github.com/apache/camel/pull/8765 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] klease commented on pull request #8765: CAMEL-18707: upgrade to Jandex 3
klease commented on PR #8765: URL: https://github.com/apache/camel/pull/8765#issuecomment-1324932454 This fixes the errors in the generated deserializers which caused the incorrect json. Tests now pass. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-website] branch regen_bot updated (b08c4466 -> e789ff79)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel-website.git from b08c4466 Added Camel K Runtime 1.15.2 Release add e789ff79 Refine the text for the mailing list page No new revisions were added by this update. Summary of changes: content/community/mailing-list.md | 27 --- 1 file changed, 20 insertions(+), 7 deletions(-)
[camel-kamelets] 01/02: Added an SCP Sink IT Test
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch scp-sink-it-test in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit 0ad19db30e31404f8fe0b0c5932b2f6bdc7cae82 Author: Andrea Cosentino AuthorDate: Wed Nov 23 13:01:03 2022 +0100 Added an SCP Sink IT Test Signed-off-by: Andrea Cosentino --- it-tests/misc/scp/sink/timer-scp-it-test.sh | 36 + it-tests/misc/scp/sink/timer-scp.yaml | 30 2 files changed, 66 insertions(+) diff --git a/it-tests/misc/scp/sink/timer-scp-it-test.sh b/it-tests/misc/scp/sink/timer-scp-it-test.sh new file mode 100755 index ..c1788173 --- /dev/null +++ b/it-tests/misc/scp/sink/timer-scp-it-test.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +if [ $# -ne 1 ]; then +echo $0: usage: timer-scp-it-test.sh camel-version +exit 1 +fi + +camel_version=$1 + +docker pull rastasheep/ubuntu-sshd:14.04 +docker run -d -P --name test_sshd -p 32768:22 rastasheep/ubuntu-sshd:14.04 + +sleep 5 + +jbang run -Dcamel.jbang.version=$camel_version camel@apache/camel run --local-kamelet-dir=../../../../kamelets/ timer-scp.yaml & + +sleep 10 + +variable=`jbang run -Dcamel.jbang.version=$camel_version camel@apache/camel get | tail -n +2` +success=`echo $variable | cut -d' ' -f11` +fail=`echo $variable | cut -d' ' -f12` +if [[ $success == 5 && $fail == 0 ]] +then +mkdir -p ../../../tests/ +echo "Test Successful" > ../../../tests/timer-scp-it-test.result ; +else +mkdir -p ../../../tests/ +echo "Test failed" > ../../../tests/timer-scp-it-test.result ; +fi + +jbang run -Dcamel.jbang.version=$camel_version camel@apache/camel stop timer-scp + +docker stop test_sshd +docker rm test_sshd + +cat ../../../tests/timer-scp-it-test.result diff --git a/it-tests/misc/scp/sink/timer-scp.yaml b/it-tests/misc/scp/sink/timer-scp.yaml new file mode 100644 index ..03bc1fbf --- /dev/null +++ b/it-tests/misc/scp/sink/timer-scp.yaml @@ -0,0 +1,30 @@ +## --- +## 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. +## --- + +- route: +from: + uri: "timer://foo?delay=0&fixedRate=true&period=1000&repeatCount=5" + steps: + - set-body: + constant: "test" + - to: + uri: "kamelet:scp-sink" + parameters: +username: root +password: root +serverName: localhost +serverPort: 32768
[camel-kamelets] branch scp-sink-it-test created (now f0f2ae39)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch scp-sink-it-test in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git at f0f2ae39 Added SCP Sink IT Test to Makefile This branch includes the following new commits: new 0ad19db3 Added an SCP Sink IT Test new f0f2ae39 Added SCP Sink IT Test to Makefile 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.
[camel-kamelets] 02/02: Added SCP Sink IT Test to Makefile
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch scp-sink-it-test in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit f0f2ae39122dfffe4d20966b6b75df1a72a365cb Author: Andrea Cosentino AuthorDate: Wed Nov 23 13:01:58 2022 +0100 Added SCP Sink IT Test to Makefile Signed-off-by: Andrea Cosentino --- it-tests/Makefile | 4 1 file changed, 4 insertions(+) diff --git a/it-tests/Makefile b/it-tests/Makefile index f45c1245..d123f02a 100644 --- a/it-tests/Makefile +++ b/it-tests/Makefile @@ -37,6 +37,8 @@ all: ./sftp-log-it-test.sh $(camel-version) cd misc/sftp/sink/ && \ ./timer-sftp-it-test.sh $(camel-version) + cd misc/scp/sink/ && \ + ./timer-scp-it-test.sh $(camel-version) ./scripts/results.sh rm -rf tests aws: @@ -67,6 +69,8 @@ misc: ./sftp-log-it-test.sh $(camel-version) cd misc/sftp/sink/ && \ ./timer-sftp-it-test.sh $(camel-version) + cd misc/scp/sink/ && \ + ./timer-scp-it-test.sh $(camel-version) ./scripts/results.sh rm -rf tests
[GitHub] [camel-website] github-actions[bot] commented on pull request #925: Remove newline after the link
github-actions[bot] commented on PR #925: URL: https://github.com/apache/camel-website/pull/925#issuecomment-1324971217 🚀 Preview is available at https://pr-925--camel.netlify.app -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #8765: CAMEL-18707: upgrade to Jandex 3
github-actions[bot] commented on PR #8765: URL: https://github.com/apache/camel/pull/8765#issuecomment-1324989454 :no_entry_sign: There are (likely) no components to be tested in this PR -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] oscerd merged pull request #1175: SCP Sink IT Test
oscerd merged PR #1175: URL: https://github.com/apache/camel-kamelets/pull/1175 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kamelets] 02/02: Added SCP Sink IT Test to Makefile
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit 9d50929713a5f4d21e99e64c8f9068f6ac648148 Author: Andrea Cosentino AuthorDate: Wed Nov 23 13:01:58 2022 +0100 Added SCP Sink IT Test to Makefile Signed-off-by: Andrea Cosentino --- it-tests/Makefile | 4 1 file changed, 4 insertions(+) diff --git a/it-tests/Makefile b/it-tests/Makefile index f45c1245..d123f02a 100644 --- a/it-tests/Makefile +++ b/it-tests/Makefile @@ -37,6 +37,8 @@ all: ./sftp-log-it-test.sh $(camel-version) cd misc/sftp/sink/ && \ ./timer-sftp-it-test.sh $(camel-version) + cd misc/scp/sink/ && \ + ./timer-scp-it-test.sh $(camel-version) ./scripts/results.sh rm -rf tests aws: @@ -67,6 +69,8 @@ misc: ./sftp-log-it-test.sh $(camel-version) cd misc/sftp/sink/ && \ ./timer-sftp-it-test.sh $(camel-version) + cd misc/scp/sink/ && \ + ./timer-scp-it-test.sh $(camel-version) ./scripts/results.sh rm -rf tests
[camel-kamelets] 01/02: Added an SCP Sink IT Test
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit c8853d8ab07955620abf58153e5a572024f50743 Author: Andrea Cosentino AuthorDate: Wed Nov 23 13:01:03 2022 +0100 Added an SCP Sink IT Test Signed-off-by: Andrea Cosentino --- it-tests/misc/scp/sink/timer-scp-it-test.sh | 36 + it-tests/misc/scp/sink/timer-scp.yaml | 30 2 files changed, 66 insertions(+) diff --git a/it-tests/misc/scp/sink/timer-scp-it-test.sh b/it-tests/misc/scp/sink/timer-scp-it-test.sh new file mode 100755 index ..c1788173 --- /dev/null +++ b/it-tests/misc/scp/sink/timer-scp-it-test.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +if [ $# -ne 1 ]; then +echo $0: usage: timer-scp-it-test.sh camel-version +exit 1 +fi + +camel_version=$1 + +docker pull rastasheep/ubuntu-sshd:14.04 +docker run -d -P --name test_sshd -p 32768:22 rastasheep/ubuntu-sshd:14.04 + +sleep 5 + +jbang run -Dcamel.jbang.version=$camel_version camel@apache/camel run --local-kamelet-dir=../../../../kamelets/ timer-scp.yaml & + +sleep 10 + +variable=`jbang run -Dcamel.jbang.version=$camel_version camel@apache/camel get | tail -n +2` +success=`echo $variable | cut -d' ' -f11` +fail=`echo $variable | cut -d' ' -f12` +if [[ $success == 5 && $fail == 0 ]] +then +mkdir -p ../../../tests/ +echo "Test Successful" > ../../../tests/timer-scp-it-test.result ; +else +mkdir -p ../../../tests/ +echo "Test failed" > ../../../tests/timer-scp-it-test.result ; +fi + +jbang run -Dcamel.jbang.version=$camel_version camel@apache/camel stop timer-scp + +docker stop test_sshd +docker rm test_sshd + +cat ../../../tests/timer-scp-it-test.result diff --git a/it-tests/misc/scp/sink/timer-scp.yaml b/it-tests/misc/scp/sink/timer-scp.yaml new file mode 100644 index ..03bc1fbf --- /dev/null +++ b/it-tests/misc/scp/sink/timer-scp.yaml @@ -0,0 +1,30 @@ +## --- +## 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. +## --- + +- route: +from: + uri: "timer://foo?delay=0&fixedRate=true&period=1000&repeatCount=5" + steps: + - set-body: + constant: "test" + - to: + uri: "kamelet:scp-sink" + parameters: +username: root +password: root +serverName: localhost +serverPort: 32768
[camel-kamelets] branch main updated (01421917 -> 9d509297)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git from 01421917 SFTP Source Container it-test: Don't log container id new c8853d8a Added an SCP Sink IT Test new 9d509297 Added SCP Sink IT Test to Makefile 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: it-tests/Makefile| 4 .../sink/timer-scp-it-test.sh} | 20 ++-- .../scp/sink/timer-scp.yaml} | 9 + 3 files changed, 19 insertions(+), 14 deletions(-) copy it-tests/misc/{sftp/sink/timer-sftp-it-test.sh => scp/sink/timer-scp-it-test.sh} (51%) copy it-tests/{aws/aws-kinesis/sink/timer-aws-kinesis.yaml => misc/scp/sink/timer-scp.yaml} (87%)
[camel-kamelets] branch regen_bot updated (01421917 -> 9d509297)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git from 01421917 SFTP Source Container it-test: Don't log container id add c8853d8a Added an SCP Sink IT Test add 9d509297 Added SCP Sink IT Test to Makefile No new revisions were added by this update. Summary of changes: it-tests/Makefile| 4 .../sink/timer-scp-it-test.sh} | 20 ++-- .../scp/sink/timer-scp.yaml} | 9 + 3 files changed, 19 insertions(+), 14 deletions(-) copy it-tests/misc/{sftp/sink/timer-sftp-it-test.sh => scp/sink/timer-scp-it-test.sh} (51%) copy it-tests/{aws/aws-kinesis/sink/timer-aws-kinesis.yaml => misc/scp/sink/timer-scp.yaml} (87%)
[GitHub] [camel-website] zregvart merged pull request #925: Remove newline after the link
zregvart merged PR #925: URL: https://github.com/apache/camel-website/pull/925 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-website] branch main updated: Remove newline after the link
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-website.git The following commit(s) were added to refs/heads/main by this push: new 6f1d6d88 Remove newline after the link 6f1d6d88 is described below commit 6f1d6d88edac36e46dd2a9d61e3899269d57ec04 Author: Zoran Regvart AuthorDate: Tue Nov 22 13:36:07 2022 +0100 Remove newline after the link We need to add custom comment to remove the newline at the end of the file in the `render-link.html` so that there is no newline after the rendered link, leading to an additional whitespace before the next character. Most commonly this results in a " ." instead of "." following the link. --- layouts/_default/_markup/render-link.html | 1 + 1 file changed, 1 insertion(+) diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html index dfe675e7..a3b7228b 100644 --- a/layouts/_default/_markup/render-link.html +++ b/layouts/_default/_markup/render-link.html @@ -1 +1,2 @@ {{ .Text | safeHTML }} +{{- /**/ -}}
[GitHub] [camel] davsclaus merged pull request #8765: CAMEL-18707: upgrade to Jandex 3
davsclaus merged PR #8765: URL: https://github.com/apache/camel/pull/8765 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: CAMEL-18707: upgrade to Jandex 3 (#8765)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 16c546b1d08 CAMEL-18707: upgrade to Jandex 3 (#8765) 16c546b1d08 is described below commit 16c546b1d08b5501bc3cf203adeeec1fc30b02bf Author: klease <38634989+kle...@users.noreply.github.com> AuthorDate: Wed Nov 23 13:56:18 2022 +0100 CAMEL-18707: upgrade to Jandex 3 (#8765) * CAMEL-18707: Upgrade to Jandex 3.0.3 (#8735) Change maven group to io.smallrye. Adapt to minor API changes in Jandex 3. * CAMEL-18707: fix issue related to deserializer generation. Update use of deprecated method in jandex API. --- camel-dependencies/pom.xml | 2 +- dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml | 2 +- .../maven/dsl/yaml/GenerateYamlDeserializersMojo.java | 4 ++-- .../camel/maven/dsl/yaml/GenerateYamlSupportMojo.java | 12 ++-- parent/pom.xml | 2 +- tooling/maven/camel-package-maven-plugin/pom.xml| 2 +- .../maven/packaging/GenerateInvokeOnHeaderMojo.java | 2 +- .../packaging/TypeConverterLoaderGeneratorMojo.java | 17 + 8 files changed, 22 insertions(+), 21 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index e124b97ce6a..2029ef5ba94 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -282,7 +282,7 @@ 2.3.3 1.6.7 3.0.3 -2.4.3.Final +3.0.3 2.4.0 0.11 1.9.3 diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml index 8adbef6aab1..765fd4a8009 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml @@ -118,7 +118,7 @@ -org.jboss +io.smallrye jandex ${jandex-version} diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java index a9ab21ad219..7540ff306f0 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java @@ -432,7 +432,7 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo { break; } -if (ctor.parameters().size() == 1 && ctor.parameters().get(0).name().equals(STRING_CLASS)) { +if (ctor.parameterTypes().size() == 1 && ctor.parameterTypes().get(0).name().equals(STRING_CLASS)) { if ((ctor.flags() & java.lang.reflect.Modifier.PUBLIC) == 0) { break; } @@ -987,7 +987,7 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo { @SuppressWarnings("MethodLength") private boolean generateSetValue(CodeBlock.Builder cb, MethodInfo method, Collection annotations) { final String name = StringHelper.camelCaseToDash(method.name()).toLowerCase(Locale.US).substring(4); -final Type parameterType = method.parameters().get(0); +final Type parameterType = method.parameterTypes().get(0); // // Others diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java index 89f626edbd8..dd26b56ff68 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java @@ -186,7 +186,7 @@ public abstract class GenerateYamlSupportMojo extends AbstractMojo { if (target == null) { return false; } -return target.classAnnotation(annotationName) != null; +return target.declaredAnnotation(annotationName) != null; } protected static boolean hasAnnotation(FieldInfo target, DotName annotationName) { @@ -207,7 +207,7 @@ public abstract class GenerateYamlSupportMojo extends AbstractMojo { return false; } return annotationValue( -target.classAnnotation(annotationName), +target.declaredAnnotation(annotationName), name).isPresent(); } @@ -222,7 +222,7 @@
[GitHub] [camel] davsclaus commented on pull request #8765: CAMEL-18707: upgrade to Jandex 3
davsclaus commented on PR #8765: URL: https://github.com/apache/camel/pull/8765#issuecomment-1325015306 Thanks for working on a fix so quickly -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-website] branch regen_bot updated (e789ff79 -> 6f1d6d88)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel-website.git from e789ff79 Refine the text for the mailing list page add 6f1d6d88 Remove newline after the link No new revisions were added by this update. Summary of changes: layouts/_default/_markup/render-link.html | 1 + 1 file changed, 1 insertion(+)
[camel-spring-boot] branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/main by this push: new 5892b0799b1 Regen 5892b0799b1 is described below commit 5892b0799b195fa1218afd475c19f9fee1d96f05 Author: Claus Ibsen AuthorDate: Wed Nov 23 14:03:24 2022 +0100 Regen --- tooling/camel-spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index a1e1b5a4b7b..2ed7521ee11 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -4648,7 +4648,7 @@ org.codehaus.jettison jettison -1.5.1 +1.5.2 org.codehaus.woodstox
[GitHub] [camel-k] squakez closed issue #3787: Remove code deprecated before 1.8 (LTS)
squakez closed issue #3787: Remove code deprecated before 1.8 (LTS) URL: https://github.com/apache/camel-k/issues/3787 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch main updated (1bb415b01 -> 6822ea897)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from 1bb415b01 Updated CHANGELOG.md new 379c681fe chore: remove deprecated code new de4f44519 fix: lint warnings new 6822ea897 fix(e2e): debug 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: config/crd/bases/camel.apache.org_builds.yaml | 137 --- .../crd/bases/camel.apache.org_camelcatalogs.yaml | 11 - .../bases/camel.apache.org_integrationkits.yaml| 15 +- .../camel.apache.org_integrationplatforms.yaml | 262 ++--- .../crd/bases/camel.apache.org_integrations.yaml | 178 -- .../bases/camel.apache.org_kameletbindings.yaml| 131 --- config/crd/bases/camel.apache.org_kamelets.yaml| 8 - docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 257 ++-- docs/modules/ROOT/partials/apis/kamelets-crds.adoc | 26 -- helm/camel-k/crds/crd-build.yaml | 137 --- helm/camel-k/crds/crd-camel-catalog.yaml | 11 - helm/camel-k/crds/crd-integration-kit.yaml | 15 +- helm/camel-k/crds/crd-integration-platform.yaml| 262 ++--- helm/camel-k/crds/crd-integration.yaml | 178 -- helm/camel-k/crds/crd-kamelet-binding.yaml | 131 --- helm/camel-k/crds/crd-kamelet.yaml | 8 - pkg/apis/camel/v1/build_types.go | 5 - pkg/apis/camel/v1/camelcatalog_types.go| 3 - pkg/apis/camel/v1/common_types.go | 8 - pkg/apis/camel/v1/integration_types.go | 7 - pkg/apis/camel/v1/integration_types_support.go | 32 --- pkg/apis/camel/v1/integrationkit_types.go | 6 +- pkg/apis/camel/v1/integrationplatform_types.go | 20 +- pkg/apis/camel/v1/maven_types.go | 8 - pkg/apis/camel/v1/trait/container.go | 44 pkg/apis/camel/v1/trait/zz_generated.deepcopy.go | 5 - pkg/apis/camel/v1/zz_generated.deepcopy.go | 78 +- pkg/apis/camel/v1alpha1/error_handler_types.go | 3 - pkg/apis/camel/v1alpha1/kamelet_types.go | 10 - pkg/apis/camel/v1alpha1/kamelet_types_support.go | 10 - pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go | 25 -- pkg/builder/builder.go | 25 -- pkg/builder/project.go | 15 +- pkg/cmd/describe_integration.go| 10 - pkg/cmd/run_test.go| 4 +- pkg/controller/integrationplatform/initialize.go | 11 +- pkg/controller/integrationplatform/kaniko_cache.go | 6 +- pkg/controller/kameletbinding/error_handler.go | 3 - pkg/kamelet/initialize.go | 9 - pkg/resources/resources.go | 28 +-- pkg/trait/builder.go | 12 +- pkg/trait/builder_test.go | 2 - pkg/trait/camel.go | 48 pkg/trait/container.go | 11 +- pkg/trait/container_probes_test.go | 43 ++-- pkg/trait/cron_test.go | 6 +- pkg/trait/health.go| 20 -- pkg/trait/kamelets.go | 11 +- pkg/trait/knative_service_test.go | 17 +- pkg/trait/knative_test.go | 7 +- pkg/trait/openapi.go | 43 +--- pkg/trait/openapi_test.go | 8 +- pkg/trait/trait_test.go| 159 + pkg/trait/trait_types.go | 41 pkg/trait/util.go | 4 - pkg/util/camel/catalog.go | 17 +- pkg/util/digest/digest.go | 7 - pkg/util/kubernetes/resolver.go| 26 -- 58 files changed, 143 insertions(+), 2481 deletions(-)
[GitHub] [camel-k] squakez merged pull request #3819: chore: remove deprecated code
squakez merged PR #3819: URL: https://github.com/apache/camel-k/pull/3819 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] 02/03: fix: lint warnings
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit de4f44519cebe944384ac00e5271016724346d87 Author: Pasquale Congiusti AuthorDate: Thu Nov 17 10:39:56 2022 +0100 fix: lint warnings --- pkg/apis/camel/v1alpha1/kamelet_types_support.go | 7 --- pkg/builder/project.go | 12 pkg/controller/integrationplatform/initialize.go | 1 - pkg/kamelet/initialize.go| 9 - pkg/trait/openapi.go | 10 -- pkg/trait/trait_types.go | 14 -- pkg/util/camel/catalog.go| 16 ++-- 7 files changed, 2 insertions(+), 67 deletions(-) diff --git a/pkg/apis/camel/v1alpha1/kamelet_types_support.go b/pkg/apis/camel/v1alpha1/kamelet_types_support.go index 3b91a2d1e..52635f28e 100644 --- a/pkg/apis/camel/v1alpha1/kamelet_types_support.go +++ b/pkg/apis/camel/v1alpha1/kamelet_types_support.go @@ -192,13 +192,6 @@ func ValidKameletProperties(kamelet *Kamelet) bool { return true } -func ValidKamelet(kamelet *Kamelet) bool { - if kamelet == nil { - return true - } - return true -} - // NewKamelet creates a new kamelet func NewKamelet(namespace string, name string) Kamelet { return Kamelet{ diff --git a/pkg/builder/project.go b/pkg/builder/project.go index 66071522e..8c325ff8b 100644 --- a/pkg/builder/project.go +++ b/pkg/builder/project.go @@ -24,8 +24,6 @@ import ( "regexp" "strings" - corev1 "k8s.io/api/core/v1" - v1 "github.com/apache/camel-k/pkg/apis/camel/v1" "github.com/apache/camel-k/pkg/util/camel" "github.com/apache/camel-k/pkg/util/jvm" @@ -93,16 +91,6 @@ func generateJavaKeystore(ctx *builderContext) error { return jvm.GenerateKeystore(ctx.C, ctx.Path, ctx.Maven.TrustStoreName, ctx.Maven.TrustStorePass, certsData) } -func mergeSecrets(secrets []corev1.SecretKeySelector, secret *corev1.SecretKeySelector) []corev1.SecretKeySelector { - if secrets == nil && secret == nil { - return nil - } - if secret == nil { - return secrets - } - return append(secrets, *secret) -} - func generateProjectSettings(ctx *builderContext) error { val, err := kubernetes.ResolveValueSource(ctx.C, ctx.Client, ctx.Namespace, &ctx.Build.Maven.Settings) if err != nil { diff --git a/pkg/controller/integrationplatform/initialize.go b/pkg/controller/integrationplatform/initialize.go index 9fc708adb..ae820d6a7 100644 --- a/pkg/controller/integrationplatform/initialize.go +++ b/pkg/controller/integrationplatform/initialize.go @@ -69,7 +69,6 @@ func (action *initializeAction) Handle(ctx context.Context, platform *v1.Integra if err = platformutil.ConfigureDefaults(ctx, action.client, platform, true); err != nil { return nil, err } - // nolint: staticcheck if platform.Status.Build.PublishStrategy == v1.IntegrationPlatformBuildPublishStrategyKaniko { cacheEnabled := platform.Status.Build.IsOptionEnabled(builder.KanikoBuildCacheEnabled) if cacheEnabled { diff --git a/pkg/kamelet/initialize.go b/pkg/kamelet/initialize.go index 3d9ce8c23..cb0a93bf0 100644 --- a/pkg/kamelet/initialize.go +++ b/pkg/kamelet/initialize.go @@ -50,15 +50,6 @@ func Initialize(kamelet *v1alpha1.Kamelet) (*v1alpha1.Kamelet, error) { fmt.Sprintf("Kamelet property %q is reserved and cannot be part of the schema", v1alpha1.KameletIDProperty), ) } - if !v1alpha1.ValidKamelet(kamelet) { - ok = false - target.Status.SetCondition( - v1alpha1.KameletConditionReady, - corev1.ConditionFalse, - v1alpha1.KameletConditionReasonInvalidTemplate, - `Kamelet can only specify one of "flow" or "template"`, - ) - } if !ok { target.Status.Phase = v1alpha1.KameletPhaseError diff --git a/pkg/trait/openapi.go b/pkg/trait/openapi.go index 15b3b061b..8615b1b07 100644 --- a/pkg/trait/openapi.go +++ b/pkg/trait/openapi.go @@ -319,16 +319,6 @@ func (t *openAPITrait) createNewOpenAPIConfigMap(e *Environment, resource v1.Dat return nil } -func mergeSecrets(secrets []corev1.SecretKeySelector, secret *corev1.SecretKeySelector) []corev1.SecretKeySelector { - if secrets == nil && secret == nil { - return nil - } - if secret == nil { - return secrets - } - return append(secrets, *secret) -} - func (t *openAPITrait) generateMavenProject(e *Environment) (maven.Project, error) { if e.CamelCatalog == nil { return maven.Project{}, errors.New("unk
[camel-k] 03/03: fix(e2e): debug test
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 6822ea89720742ec9feba89a1158b6f0afe807f2 Author: Pasquale Congiusti AuthorDate: Tue Nov 22 15:31:43 2022 +0100 fix(e2e): debug test --- pkg/trait/container_probes_test.go | 15 ++- pkg/trait/health.go| 4 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/pkg/trait/container_probes_test.go b/pkg/trait/container_probes_test.go index 2a8355ebe..ea2185792 100644 --- a/pkg/trait/container_probes_test.go +++ b/pkg/trait/container_probes_test.go @@ -63,7 +63,11 @@ func TestProbesDependencies(t *testing.T) { integration := &v1.Integration{ Spec: v1.IntegrationSpec{ Traits: v1.Traits{ - Health: &traitv1.HealthTrait{}, + Health: &traitv1.HealthTrait{ + Trait: traitv1.Trait{ + Enabled: pointer.Bool(true), + }, + }, }, }, } @@ -82,6 +86,9 @@ func TestProbesOnDeployment(t *testing.T) { Spec: v1.IntegrationSpec{ Traits: v1.Traits{ Health: &traitv1.HealthTrait{ + Trait: traitv1.Trait{ + Enabled: pointer.Bool(true), + }, LivenessProbeEnabled: pointer.Bool(true), ReadinessProbeEnabled: pointer.Bool(true), LivenessTimeout: 1234, @@ -114,6 +121,9 @@ func TestProbesOnDeploymentWithCustomScheme(t *testing.T) { Spec: v1.IntegrationSpec{ Traits: v1.Traits{ Health: &traitv1.HealthTrait{ + Trait: traitv1.Trait{ + Enabled: pointer.Bool(true), + }, LivenessProbeEnabled: pointer.Bool(true), ReadinessProbeEnabled: pointer.Bool(true), LivenessScheme:"HTTPS", @@ -154,6 +164,9 @@ func TestProbesOnKnativeService(t *testing.T) { }, }, Health: &traitv1.HealthTrait{ + Trait: traitv1.Trait{ + Enabled: pointer.Bool(true), + }, LivenessProbeEnabled: pointer.Bool(true), ReadinessProbeEnabled: pointer.Bool(true), LivenessTimeout: 1234, diff --git a/pkg/trait/health.go b/pkg/trait/health.go index ba06fb10c..7eee33b3b 100644 --- a/pkg/trait/health.go +++ b/pkg/trait/health.go @@ -55,6 +55,10 @@ func (t *healthTrait) Configure(e *Environment) (bool, error) { return false, nil } + if !pointer.BoolDeref(t.Enabled, false) { + return false, nil + } + return true, nil }
[GitHub] [camel] klease commented on pull request #8765: CAMEL-18707: upgrade to Jandex 3
klease commented on PR #8765: URL: https://github.com/apache/camel/pull/8765#issuecomment-1325080309 I thought I had run the tests the first time but obviously not the right ones! -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k-runtime] branch 1.16.0-prepare updated (1b93a258 -> d7ad8d9f)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch 1.16.0-prepare in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git from 1b93a258 Preparing for Camel K Runtime 1.16.0 - Use Camel-quarkus knative add d7ad8d9f Reintroduce the Camel-K-Knative-impl dependency and revisit modules No new revisions were added by this update. Summary of changes: {camel-k-webhook => camel-k-knative}/impl/pom.xml | 25 ++--- ...tiveSinkBindingContextCustomizerConfigurer.java | 67 + customizer.KnativeSinkBindingContextCustomizer | 2 + .../KnativeSinkBindingContextCustomizer.java | 107 + .../knative/KnativeSourceLoaderInterceptor.java| 53 ++ {camel-k-cron => camel-k-knative}/pom.xml | 4 +- itests/camel-k-itests-knative-consumer/pom.xml | 4 + .../camel/k/quarkus/it/KnativeConsumerTest.java| 5 +- .../pom.xml| 4 + .../pom.xml| 2 +- itests/camel-k-itests-knative-producer/pom.xml | 4 + .../camel/k/quarkus/it/KnativeProducerTest.java| 5 +- itests/camel-k-itests-knative-sinkbinding/pom.xml | 4 + .../camel-k-itests-knative-source-groovy/pom.xml | 4 + itests/camel-k-itests-knative-source-java/pom.xml | 4 + itests/camel-k-itests-knative-source-js/pom.xml| 4 + itests/camel-k-itests-knative-source-xml/pom.xml | 4 + itests/camel-k-itests-knative-source-yaml/pom.xml | 4 + itests/camel-k-itests-runtime-yaml/pom.xml | 17 +--- pom.xml| 8 ++ support/camel-k-runtime-bom/pom.xml| 5 + 21 files changed, 299 insertions(+), 37 deletions(-) copy {camel-k-webhook => camel-k-knative}/impl/pom.xml (88%) create mode 100644 camel-k-knative/impl/src/generated/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizerConfigurer.java create mode 100644 camel-k-knative/impl/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.knative.customizer.KnativeSinkBindingContextCustomizer create mode 100644 camel-k-knative/impl/src/main/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizer.java create mode 100644 camel-k-knative/impl/src/main/java/org/apache/camel/k/loader/knative/KnativeSourceLoaderInterceptor.java copy {camel-k-cron => camel-k-knative}/pom.xml (92%)
[GitHub] [camel-quarkus] oscerd commented on issue #3459: Extensions for camel-knative and camel-cloudevents
oscerd commented on issue #3459: URL: https://github.com/apache/camel-quarkus/issues/3459#issuecomment-1325084001 What is the plan for the impl module? Do we want to move it in camel-quarkus since we would like to move the camel-k-runtime to it already? -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: camel-jbang - Auto-configure via java source should automatic download camel-joor if needed.
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 3c8d1c28d40 camel-jbang - Auto-configure via java source should automatic download camel-joor if needed. 3c8d1c28d40 is described below commit 3c8d1c28d40b02d7f805520117f804e44958376e Author: Claus Ibsen AuthorDate: Wed Nov 23 14:40:45 2022 +0100 camel-jbang - Auto-configure via java source should automatic download camel-joor if needed. --- .../org/apache/camel/main/download/AutoConfigureDownloadListener.java | 4 1 file changed, 4 insertions(+) diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/AutoConfigureDownloadListener.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/AutoConfigureDownloadListener.java index c661cfd92af..61df86092b3 100644 --- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/AutoConfigureDownloadListener.java +++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/AutoConfigureDownloadListener.java @@ -95,6 +95,10 @@ public class AutoConfigureDownloadListener implements DownloadListener, CamelCon InputStream is = getClass().getResourceAsStream("/auto-configure/" + artifactId + ".joor"); if (is != null) { try { +// ensure java-joor is downloaded +DependencyDownloader downloader = getCamelContext().hasService(DependencyDownloader.class); +// these are extra dependencies used in special use-case so download as hidden +downloader.downloadHiddenDependency("org.apache.camel", "camel-joor", camelContext.getVersion()); // execute script via java-joor String script = IOHelper.loadText(is); Language lan = camelContext.resolveLanguage("joor");
[camel-k-runtime] branch 1.16.0-prepare updated (d7ad8d9f -> f176adcf)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch 1.16.0-prepare in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git from d7ad8d9f Reintroduce the Camel-K-Knative-impl dependency and revisit modules add f176adcf Fixed PMD No new revisions were added by this update. Summary of changes: .../main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java | 1 - 1 file changed, 1 deletion(-)
[GitHub] [camel-k-runtime] oscerd commented on pull request #927: Prepare release 1.16.0
oscerd commented on PR #927: URL: https://github.com/apache/camel-k-runtime/pull/927#issuecomment-1325090635 It should be aligned now. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (9b144a4ef69 -> 16c546b1d08)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 9b144a4ef69 Fix AsciiDoc syntax add 16c546b1d08 CAMEL-18707: upgrade to Jandex 3 (#8765) No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml | 2 +- .../maven/dsl/yaml/GenerateYamlDeserializersMojo.java | 4 ++-- .../camel/maven/dsl/yaml/GenerateYamlSupportMojo.java | 12 ++-- parent/pom.xml | 2 +- tooling/maven/camel-package-maven-plugin/pom.xml| 2 +- .../maven/packaging/GenerateInvokeOnHeaderMojo.java | 2 +- .../packaging/TypeConverterLoaderGeneratorMojo.java | 17 + 8 files changed, 22 insertions(+), 21 deletions(-)
[GitHub] [camel] orpiske commented on pull request #8751: (chores) test-infra-hdfs: upgrade hadoop to 2.10.2
orpiske commented on PR #8751: URL: https://github.com/apache/camel/pull/8751#issuecomment-1325098859 I won't be able to look at this during this week, so I created https://issues.apache.org/jira/browse/CAMEL-18747 to keep an eye on it. Hopefully next week ... let's merge this one in the mean time. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: (chores) test-infra-hdfs: upgrade hadoop to 2.10.2
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 500a2d1a04e (chores) test-infra-hdfs: upgrade hadoop to 2.10.2 500a2d1a04e is described below commit 500a2d1a04ec0a1b14a8981852f144ce33b285d6 Author: Otavio Rodolfo Piske AuthorDate: Mon Nov 21 17:03:14 2022 +0100 (chores) test-infra-hdfs: upgrade hadoop to 2.10.2 --- .../resources/org/apache/camel/test/infra/hdfs/v2/services/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-infra/camel-test-infra-hdfs/src/test/resources/org/apache/camel/test/infra/hdfs/v2/services/Dockerfile b/test-infra/camel-test-infra-hdfs/src/test/resources/org/apache/camel/test/infra/hdfs/v2/services/Dockerfile index b604c3cfcd1..2ba67331e72 100644 --- a/test-infra/camel-test-infra-hdfs/src/test/resources/org/apache/camel/test/infra/hdfs/v2/services/Dockerfile +++ b/test-infra/camel-test-infra-hdfs/src/test/resources/org/apache/camel/test/infra/hdfs/v2/services/Dockerfile @@ -16,7 +16,7 @@ ARG FROMIMAGE_BUILDER ARG FROMIMAGE FROM ${FROMIMAGE_BUILDER} as builder ARG HADOOP_VERSION -ENV HADOOP_VERSION ${HADOOP_VERSION:-2.10.0} +ENV HADOOP_VERSION ${HADOOP_VERSION:-2.10.2} RUN curl --retry 3 --retry-connrefused https://archive.apache.org/dist/hadoop/common/hadoop-${HADOOP_VERSION}/hadoop-${HADOOP_VERSION}.tar.gz -o hadoop.tar.gz RUN mkdir -p hadoop && tar --strip-components=1 -xvf hadoop.tar.gz -C /hadoop && rm -f hadoop.tar.gz ADD core-site.xml /hadoop/etc/hadoop/core-site.xml @@ -28,7 +28,7 @@ ARG FROMIMAGE FROM $FROMIMAGE LABEL maintainer="orpi...@apache.org" ARG HADOOP_VERSION -ENV HADOOP_VERSION ${HADOOP_VERSION:-2.10.0} +ENV HADOOP_VERSION ${HADOOP_VERSION:-2.10.2} EXPOSE 8020 9000 50010 50020 50070 50075 ENV JAVA_HOME /etc/alternatives/jre ENV HADOOP_HOME /hadoop
[GitHub] [camel] orpiske merged pull request #8751: (chores) test-infra-hdfs: upgrade hadoop to 2.10.2
orpiske merged PR #8751: URL: https://github.com/apache/camel/pull/8751 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] oscerd commented on pull request #1162: chore: Introduce Kamelet input/output data types
oscerd commented on PR #1162: URL: https://github.com/apache/camel-kamelets/pull/1162#issuecomment-1325121789 Camel-k-runtime seems to be ok while upgrading to the required bits for Camel 3.19.0 and Camel Quarkus 2.14.0. I would like to include this PR in 0.10.0 and release by the end of this week or beginning of the next. So we could have a first camel k release (1.11.0) upstream with this feature. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k-runtime] oscerd commented on pull request #927: Prepare release 1.16.0
oscerd commented on PR #927: URL: https://github.com/apache/camel-k-runtime/pull/927#issuecomment-1325125513 All green. I'm going to merge. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k-runtime] oscerd merged pull request #927: Prepare release 1.16.0
oscerd merged PR #927: URL: https://github.com/apache/camel-k-runtime/pull/927 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k-runtime] 03/07: Preparing for release 1.16.0 - Upgrade to Quarkus 2.14.0.Final
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git commit 2e97cad3254088fd055183bd87295f7929e205a1 Author: Andrea Cosentino AuthorDate: Thu Nov 17 14:36:02 2022 +0100 Preparing for release 1.16.0 - Upgrade to Quarkus 2.14.0.Final Signed-off-by: Andrea Cosentino --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fac37eed..1a95a184 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ 2.14.0 -2.13.3.Final +2.14.0.Final 2.13.4.Final quay.io/quarkus/ubi-quarkus-native-image:22.3.0-java11
[camel-k-runtime] 02/07: Preparing for release 1.16.0 - Upgrade to Camel-Quarkus 2.14.0
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git commit ecf9b13256eb85cd12ba3e7ee912a83919442db0 Author: Andrea Cosentino AuthorDate: Thu Nov 17 14:35:31 2022 +0100 Preparing for release 1.16.0 - Upgrade to Camel-Quarkus 2.14.0 Signed-off-by: Andrea Cosentino --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 05057f67..fac37eed 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 3.19.0 -2.13.1 +2.14.0 2.13.3.Final 2.13.4.Final quay.io/quarkus/ubi-quarkus-native-image:22.3.0-java11
[camel-k-runtime] 01/07: Preparing for release 1.16.0 - Upgrade to Camel 3.19.0
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git commit a7a387936d947437f587011bde907e60d437f2d4 Author: Andrea Cosentino AuthorDate: Thu Nov 17 14:33:43 2022 +0100 Preparing for release 1.16.0 - Upgrade to Camel 3.19.0 Signed-off-by: Andrea Cosentino --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8a73ed36..05057f67 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.camel camel-dependencies -3.18.3 +3.19.0 4.0.0 @@ -38,7 +38,7 @@ 11 11 -3.18.3 +3.19.0 2.13.1
[camel-k-runtime] branch main updated (9f469802 -> 6aca02f1)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git from 9f469802 Updated CHANGELOG.md new a7a38793 Preparing for release 1.16.0 - Upgrade to Camel 3.19.0 new ecf9b132 Preparing for release 1.16.0 - Upgrade to Camel-Quarkus 2.14.0 new 2e97cad3 Preparing for release 1.16.0 - Upgrade to Quarkus 2.14.0.Final new 626f798d Preparing for release 1.16.0 - Upgrade to Quarkus Platform 2.14.0.Final new d9a7370e Preparing for Camel K Runtime 1.16.0 - Use Camel-quarkus knative new 8b2ee19a Reintroduce the Camel-K-Knative-impl dependency and revisit modules new 6aca02f1 Fixed PMD The 7 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: camel-k-knative/consumer/deployment/pom.xml| 67 -- .../deployment/KnativeConsumerFeature.java | 29 -- .../deployment/KnativeConsumerProcessor.java | 40 camel-k-knative/consumer/pom.xml | 37 camel-k-knative/consumer/runtime/pom.xml | 102 .../knative/consumer/KnativeConsumerRecorder.java | 44 - camel-k-knative/deployment/pom.xml | 68 -- .../quarkus/knative/deployment/KnativeFeature.java | 29 -- .../knative/deployment/KnativeProcessor.java | 68 -- camel-k-knative/pom.xml| 4 - camel-k-knative/producer/deployment/pom.xml| 67 -- .../deployment/KnativeProducerFeature.java | 29 -- .../deployment/KnativeProducerProcessor.java | 40 camel-k-knative/producer/pom.xml | 37 camel-k-knative/producer/runtime/pom.xml | 102 .../knative/producer/KnativeProducerRecorder.java | 46 - camel-k-knative/runtime/pom.xml| 103 - .../camel/k/quarkus/knative/KnativeRecorder.java | 28 -- .../camel/k/resume/kafka/KafkaResumeFactory.java | 4 - examples/knative/pom.xml | 8 +- itests/camel-k-itests-knative-consumer/pom.xml | 36 ++- .../camel/k/quarkus/it/KnativeConsumerTest.java| 5 +- .../pom.xml| 29 ++ .../pom.xml| 14 +-- itests/camel-k-itests-knative-producer/pom.xml | 38 ++-- .../camel/k/quarkus/it/KnativeProducerTest.java| 5 +- itests/camel-k-itests-knative-sinkbinding/pom.xml | 23 ++--- .../camel-k-itests-knative-source-groovy/pom.xml | 27 ++ itests/camel-k-itests-knative-source-java/pom.xml | 27 ++ itests/camel-k-itests-knative-source-js/pom.xml| 27 ++ itests/camel-k-itests-knative-source-xml/pom.xml | 27 ++ itests/camel-k-itests-knative-source-yaml/pom.xml | 27 ++ itests/camel-k-itests-knative/pom.xml | 25 ++--- itests/camel-k-itests-runtime-yaml/pom.xml | 53 ++- pom.xml| 62 ++--- .../src/it/generate-catalog/verify.groovy | 13 +-- .../camel/k/tooling/maven/GenerateCatalogMojo.java | 19 support/camel-k-runtime-bom/pom.xml| 32 ++- 38 files changed, 123 insertions(+), 1318 deletions(-) delete mode 100644 camel-k-knative/consumer/deployment/pom.xml delete mode 100644 camel-k-knative/consumer/deployment/src/main/java/org/apache/camel/k/quarkus/knative/consumer/deployment/KnativeConsumerFeature.java delete mode 100644 camel-k-knative/consumer/deployment/src/main/java/org/apache/camel/k/quarkus/knative/consumer/deployment/KnativeConsumerProcessor.java delete mode 100644 camel-k-knative/consumer/pom.xml delete mode 100644 camel-k-knative/consumer/runtime/pom.xml delete mode 100644 camel-k-knative/consumer/runtime/src/main/java/org/apache/camel/k/quarkus/knative/consumer/KnativeConsumerRecorder.java delete mode 100644 camel-k-knative/deployment/pom.xml delete mode 100644 camel-k-knative/deployment/src/main/java/org/apache/camel/k/quarkus/knative/deployment/KnativeFeature.java delete mode 100644 camel-k-knative/deployment/src/main/java/org/apache/camel/k/quarkus/knative/deployment/KnativeProcessor.java delete mode 100644 camel-k-knative/producer/deployment/pom.xml delete mode 100644 camel-k-knative/producer/deployment/src/main/java/org/apache/camel/k/quarkus/knative/producer/deployment/KnativeProducerFeature.java delete mode 100644 camel-k-knative/producer/deployment/src/main/java/org/apache/camel/k/quarkus/knative/producer/deployment/KnativeProducerProcessor.java delete mode 100644 camel-k-knative/producer/pom.xml delete mode 100644 camel-k-kna
[camel-k-runtime] 04/07: Preparing for release 1.16.0 - Upgrade to Quarkus Platform 2.14.0.Final
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git commit 626f798d2d6d906fe0303bd9754181147f183954 Author: Andrea Cosentino AuthorDate: Thu Nov 17 14:37:04 2022 +0100 Preparing for release 1.16.0 - Upgrade to Quarkus Platform 2.14.0.Final Signed-off-by: Andrea Cosentino --- pom.xml | 2 +- support/camel-k-runtime-bom/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1a95a184..02a9c113 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ 2.14.0 2.14.0.Final -2.13.4.Final +2.14.0.Final quay.io/quarkus/ubi-quarkus-native-image:22.3.0-java11 diff --git a/support/camel-k-runtime-bom/pom.xml b/support/camel-k-runtime-bom/pom.xml index 1fa1a315..1e9ef13a 100644 --- a/support/camel-k-runtime-bom/pom.xml +++ b/support/camel-k-runtime-bom/pom.xml @@ -38,7 +38,7 @@ 1.7.1 3.1.0 3.6.3 -2.13.4.Final +2.14.0.Final
[camel-k-runtime] 06/07: Reintroduce the Camel-K-Knative-impl dependency and revisit modules
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git commit 8b2ee19a9a0acfe5d97a7b3618776ecb5cc76717 Author: Andrea Cosentino AuthorDate: Wed Nov 23 14:39:22 2022 +0100 Reintroduce the Camel-K-Knative-impl dependency and revisit modules Signed-off-by: Andrea Cosentino --- camel-k-knative/impl/pom.xml | 110 + ...tiveSinkBindingContextCustomizerConfigurer.java | 67 + customizer.KnativeSinkBindingContextCustomizer | 2 + .../KnativeSinkBindingContextCustomizer.java | 107 .../knative/KnativeSourceLoaderInterceptor.java| 53 ++ camel-k-knative/pom.xml| 35 +++ itests/camel-k-itests-knative-consumer/pom.xml | 4 + .../camel/k/quarkus/it/KnativeConsumerTest.java| 5 +- .../pom.xml| 4 + .../pom.xml| 2 +- itests/camel-k-itests-knative-producer/pom.xml | 4 + .../camel/k/quarkus/it/KnativeProducerTest.java| 5 +- itests/camel-k-itests-knative-sinkbinding/pom.xml | 4 + .../camel-k-itests-knative-source-groovy/pom.xml | 4 + itests/camel-k-itests-knative-source-java/pom.xml | 4 + itests/camel-k-itests-knative-source-js/pom.xml| 4 + itests/camel-k-itests-knative-source-xml/pom.xml | 4 + itests/camel-k-itests-knative-source-yaml/pom.xml | 4 + itests/camel-k-itests-runtime-yaml/pom.xml | 17 +--- pom.xml| 8 ++ support/camel-k-runtime-bom/pom.xml| 5 + 21 files changed, 434 insertions(+), 18 deletions(-) diff --git a/camel-k-knative/impl/pom.xml b/camel-k-knative/impl/pom.xml new file mode 100644 index ..a9428459 --- /dev/null +++ b/camel-k-knative/impl/pom.xml @@ -0,0 +1,110 @@ + + +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";> + +org.apache.camel.k +camel-k-knative-parent +1.16.0-SNAPSHOT + +4.0.0 + +camel-k-knative-impl + + + +org.apache.camel.k +camel-k-core-support + + +org.apache.camel +camel-knative + + +org.apache.camel +camel-knative-http + + + +org.apache.camel.k +camel-k-apt +true + + +org.apache.camel.k +camel-k-annotations +true + + + + + + +org.jboss.jandex +jandex-maven-plugin + + +make-index + +jandex + + + + + +org.apache.camel +camel-package-maven-plugin +${camel-version} + + +generate-configurer +process-classes + +generate-configurer + + + + + +org.codehaus.mojo +build-helper-maven-plugin + + +generate-sources + +add-source +add-resource + + + +src/generated/java + + + + src/generated/resources + + + + + + + + + + diff --git a/camel-k-knative/impl/src/generated/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizerConfigurer.java b/camel-k-knative/impl/src/generated/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizerConfigurer.java new file mode 100644 index ..791d8489 --- /dev/null +++ b/camel-k-knative/impl/src/generated/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizerConfigurer.java @@ -0,0 +1,67 @@ +/* Generated by camel build tools - do NOT edit this file! */ +package org.apache.camel.k.knative.customizer; + +import java.util.Map; + +import org.apache.camel.CamelContext; +import org.apache.camel.spi.ExtendedPropertyConfigurerGetter; +import org.apache.
[camel-k-runtime] 07/07: Fixed PMD
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git commit 6aca02f1d7018664009edc40ed563d121516e7cc Author: Andrea Cosentino AuthorDate: Wed Nov 23 14:44:14 2022 +0100 Fixed PMD Signed-off-by: Andrea Cosentino --- .../main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java | 1 - 1 file changed, 1 deletion(-) diff --git a/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java b/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java index 98d608df..a2728475 100644 --- a/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java +++ b/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java @@ -44,7 +44,6 @@ import org.apache.camel.k.catalog.model.CamelArtifact; import org.apache.camel.k.catalog.model.CamelCapability; import org.apache.camel.k.catalog.model.CamelLoader; import org.apache.camel.k.catalog.model.CamelScheme; -import org.apache.camel.k.catalog.model.CamelScopedArtifact; import org.apache.camel.k.catalog.model.CatalogComponentDefinition; import org.apache.camel.k.catalog.model.CatalogDataFormatDefinition; import org.apache.camel.k.catalog.model.CatalogDefinition;
[camel-k-runtime] 05/07: Preparing for Camel K Runtime 1.16.0 - Use Camel-quarkus knative
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git commit d9a7370e853be1ed5bfc2a1b8b133b03f0826bb9 Author: Andrea Cosentino AuthorDate: Fri Nov 18 15:12:25 2022 +0100 Preparing for Camel K Runtime 1.16.0 - Use Camel-quarkus knative Signed-off-by: Andrea Cosentino --- camel-k-knative/consumer/deployment/pom.xml| 67 - .../deployment/KnativeConsumerFeature.java | 29 -- .../deployment/KnativeConsumerProcessor.java | 40 camel-k-knative/consumer/pom.xml | 37 --- camel-k-knative/consumer/runtime/pom.xml | 102 --- .../knative/consumer/KnativeConsumerRecorder.java | 44 - camel-k-knative/deployment/pom.xml | 68 - .../quarkus/knative/deployment/KnativeFeature.java | 29 -- .../knative/deployment/KnativeProcessor.java | 68 - camel-k-knative/impl/pom.xml | 110 - ...tiveSinkBindingContextCustomizerConfigurer.java | 67 - customizer.KnativeSinkBindingContextCustomizer | 2 - .../KnativeSinkBindingContextCustomizer.java | 107 .../knative/KnativeSourceLoaderInterceptor.java| 53 -- camel-k-knative/pom.xml| 39 camel-k-knative/producer/deployment/pom.xml| 67 - .../deployment/KnativeProducerFeature.java | 29 -- .../deployment/KnativeProducerProcessor.java | 40 camel-k-knative/producer/pom.xml | 37 --- camel-k-knative/producer/runtime/pom.xml | 102 --- .../knative/producer/KnativeProducerRecorder.java | 46 - camel-k-knative/runtime/pom.xml| 103 --- .../camel/k/quarkus/knative/KnativeRecorder.java | 28 -- .../camel/k/resume/kafka/KafkaResumeFactory.java | 4 - examples/knative/pom.xml | 8 +- itests/camel-k-itests-knative-consumer/pom.xml | 34 +-- .../pom.xml| 25 ++--- .../pom.xml| 12 +-- itests/camel-k-itests-knative-producer/pom.xml | 36 +-- itests/camel-k-itests-knative-sinkbinding/pom.xml | 21 +--- .../camel-k-itests-knative-source-groovy/pom.xml | 25 ++--- itests/camel-k-itests-knative-source-java/pom.xml | 25 ++--- itests/camel-k-itests-knative-source-js/pom.xml| 25 ++--- itests/camel-k-itests-knative-source-xml/pom.xml | 25 ++--- itests/camel-k-itests-knative-source-yaml/pom.xml | 25 ++--- itests/camel-k-itests-knative/pom.xml | 25 ++--- itests/camel-k-itests-runtime-yaml/pom.xml | 38 ++- pom.xml| 56 --- .../src/it/generate-catalog/verify.groovy | 13 +-- .../camel/k/tooling/maven/GenerateCatalogMojo.java | 18 support/camel-k-runtime-bom/pom.xml| 25 - 41 files changed, 72 insertions(+), 1682 deletions(-) diff --git a/camel-k-knative/consumer/deployment/pom.xml b/camel-k-knative/consumer/deployment/pom.xml deleted file mode 100644 index 4ea7baeb.. --- a/camel-k-knative/consumer/deployment/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - -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";> - -org.apache.camel.k -camel-k-knative-consumer-parent -1.16.0-SNAPSHOT - -4.0.0 - -camel-k-knative-consumer-deployment - - - -org.apache.camel.k -camel-k-knative-consumer - - -org.apache.camel.k -camel-k-cloudevents-deployment - - -org.apache.camel.quarkus -camel-quarkus-core-deployment - - -io.quarkus -quarkus-vertx-http-deployment - - - - - - -org.apache.maven.plugins -maven-compiler-plugin - - - -io.quarkus - quarkus-extension-processor -${quarkus-version} - - - - - - - - diff --git a/camel-k-knative/consumer/deployment/src/main/java/org/apache/camel/k/quarkus/knative/consumer/deployment/KnativeConsumerFeature.java b/camel-k-knative/consumer/deployment/src/main/java/org/apache/camel/k/quarkus/knative/consumer/deployment/KnativeConsumerFeature.java deleted file mode 100644 index 667deae4.. --- a/camel-k-knative/c
[GitHub] [camel-k-runtime] dependabot[bot] opened a new pull request, #931: build(deps): bump quarkus-platform-version from 2.14.0.Final to 2.14.1.Final
dependabot[bot] opened a new pull request, #931: URL: https://github.com/apache/camel-k-runtime/pull/931 Bumps `quarkus-platform-version` from 2.14.0.Final to 2.14.1.Final. Updates `quarkus-bom` from 2.14.0.Final to 2.14.1.Final Commits https://github.com/quarkusio/quarkus-platform/commit/990a19a0cadbb604634144b0aedd7bf21408449b";>990a19a [maven-release-plugin] prepare release 2.14.1.Final https://github.com/quarkusio/quarkus-platform/commit/4e6d46b24558d3fcb9574d2278fba70174fb9b5f";>4e6d46b Merge pull request https://github-redirect.dependabot.com/quarkusio/quarkus-platform/issues/705";>#705 from gsmet/quarkus-2.14.1 https://github.com/quarkusio/quarkus-platform/commit/59d598a0cdfd573f565b40a1e383f143e0e22730";>59d598a Upgrade to Quarkus 2.14.1.Final https://github.com/quarkusio/quarkus-platform/commit/363243c4afb4d46e46a21eb4933f6ee654d86487";>363243c Merge pull request https://github-redirect.dependabot.com/quarkusio/quarkus-platform/issues/698";>#698 from aloubyansky/2.14 https://github.com/quarkusio/quarkus-platform/commit/f7962ac94ce71e1ee07d48fe238885f441c6cac2";>f7962ac Remove the rhproduct profile https://github.com/quarkusio/quarkus-platform/commit/efd2c615ef2823511e4865f131d0658372963e04";>efd2c61 Merge pull request https://github-redirect.dependabot.com/quarkusio/quarkus-platform/issues/696";>#696 from aloubyansky/2.14-platform-generator-0.0.66 https://github.com/quarkusio/quarkus-platform/commit/9bf569044e3ecb3efbfbcfc0993ac8425f4bf1a8";>9bf5690 Upgrade to the platform generator 0.0.66 https://github.com/quarkusio/quarkus-platform/commit/5bdbde718f23a27100cc30b547cdfc44921b0e70";>5bdbde7 [maven-release-plugin] prepare for next development iteration See full diff in https://github.com/quarkusio/quarkus-platform/compare/2.14.0.Final...2.14.1.Final";>compare view Updates `quarkus-camel-bom` from 2.14.0.Final to 2.14.1.Final Commits https://github.com/quarkusio/quarkus-platform/commit/990a19a0cadbb604634144b0aedd7bf21408449b";>990a19a [maven-release-plugin] prepare release 2.14.1.Final https://github.com/quarkusio/quarkus-platform/commit/4e6d46b24558d3fcb9574d2278fba70174fb9b5f";>4e6d46b Merge pull request https://github-redirect.dependabot.com/quarkusio/quarkus-platform/issues/705";>#705 from gsmet/quarkus-2.14.1 https://github.com/quarkusio/quarkus-platform/commit/59d598a0cdfd573f565b40a1e383f143e0e22730";>59d598a Upgrade to Quarkus 2.14.1.Final https://github.com/quarkusio/quarkus-platform/commit/363243c4afb4d46e46a21eb4933f6ee654d86487";>363243c Merge pull request https://github-redirect.dependabot.com/quarkusio/quarkus-platform/issues/698";>#698 from aloubyansky/2.14 https://github.com/quarkusio/quarkus-platform/commit/f7962ac94ce71e1ee07d48fe238885f441c6cac2";>f7962ac Remove the rhproduct profile https://github.com/quarkusio/quarkus-platform/commit/efd2c615ef2823511e4865f131d0658372963e04";>efd2c61 Merge pull request https://github-redirect.dependabot.com/quarkusio/quarkus-platform/issues/696";>#696 from aloubyansky/2.14-platform-generator-0.0.66 https://github.com/quarkusio/quarkus-platform/commit/9bf569044e3ecb3efbfbcfc0993ac8425f4bf1a8";>9bf5690 Upgrade to the platform generator 0.0.66 https://github.com/quarkusio/quarkus-platform/commit/5bdbde718f23a27100cc30b547cdfc44921b0e70";>5bdbde7 [maven-release-plugin] prepare for next development iteration See full diff in https://github.com/quarkusio/quarkus-platform/compare/2.14.0.Final...2.14.1.Final";>compare view Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and st
[GitHub] [camel-k-runtime] dependabot[bot] commented on pull request #926: build(deps): bump quarkus-platform-version from 2.13.4.Final to 2.14.0.Final
dependabot[bot] commented on PR #926: URL: https://github.com/apache/camel-k-runtime/pull/926#issuecomment-1325129815 Superseded by #931. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k-runtime] branch dependabot/maven/quarkus-platform-version-2.14.1.Final created (now 21c107a8)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/quarkus-platform-version-2.14.1.Final in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git at 21c107a8 build(deps): bump quarkus-platform-version No new revisions were added by this update.
[GitHub] [camel-k-runtime] dependabot[bot] closed pull request #926: build(deps): bump quarkus-platform-version from 2.13.4.Final to 2.14.0.Final
dependabot[bot] closed pull request #926: build(deps): bump quarkus-platform-version from 2.13.4.Final to 2.14.0.Final URL: https://github.com/apache/camel-k-runtime/pull/926 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k-runtime] oscerd closed pull request #931: build(deps): bump quarkus-platform-version from 2.14.0.Final to 2.14.1.Final
oscerd closed pull request #931: build(deps): bump quarkus-platform-version from 2.14.0.Final to 2.14.1.Final URL: https://github.com/apache/camel-k-runtime/pull/931 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k-runtime] dependabot[bot] commented on pull request #931: build(deps): bump quarkus-platform-version from 2.14.0.Final to 2.14.1.Final
dependabot[bot] commented on PR #931: URL: https://github.com/apache/camel-k-runtime/pull/931#issuecomment-1325132508 OK, I won't notify you again about this release, but will get in touch when a new version is available. You can also ignore all major, minor, or patch releases for a dependency by adding an [`ignore` condition](https://docs.github.com/en/code-security/supply-chain-security/configuration-options-for-dependency-updates#ignore) with the desired `update_types` to your config file. If you change your mind, just re-open this PR and I'll resolve any conflicts on it. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-spring-boot] cunningt opened a new pull request, #670: CAMEL-18746 Add missing debezium db2/oracle starters
cunningt opened a new pull request, #670: URL: https://github.com/apache/camel-spring-boot/pull/670 https://issues.apache.org/jira/browse/CAMEL-18746 Needs to be added to 3.18.x branch as well, will add in a separate commit. I don't see these starters in the 3.14.x branch - I think they were added after 3.14, I think they only need to be added additionally to 3.18.x. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (16c546b1d08 -> 3c8d1c28d40)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 16c546b1d08 CAMEL-18707: upgrade to Jandex 3 (#8765) add 3c8d1c28d40 camel-jbang - Auto-configure via java source should automatic download camel-joor if needed. No new revisions were added by this update. Summary of changes: .../org/apache/camel/main/download/AutoConfigureDownloadListener.java | 4 1 file changed, 4 insertions(+)
[camel] branch regen_bot updated (3c8d1c28d40 -> 500a2d1a04e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 3c8d1c28d40 camel-jbang - Auto-configure via java source should automatic download camel-joor if needed. add 500a2d1a04e (chores) test-infra-hdfs: upgrade hadoop to 2.10.2 No new revisions were added by this update. Summary of changes: .../resources/org/apache/camel/test/infra/hdfs/v2/services/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[GitHub] [camel-karavan] mgubaidullin closed issue #530: Error and Exceptions tab in Route page
mgubaidullin closed issue #530: Error and Exceptions tab in Route page URL: https://github.com/apache/camel-karavan/issues/530 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] rangoy commented on pull request #8646: [CAMEL-18618] Milo component: Return status from write
rangoy commented on PR #8646: URL: https://github.com/apache/camel/pull/8646#issuecomment-1325250672 > I would assume future get is available during whenComplete is called I finally got to this again. For some reason I did not get that to work last time, but this seems to work as intended. I guess parsing of the status value can be left for the consumer. ``` future.whenComplete((o, throwable) -> { final DefaultMessage newMessage = new DefaultMessage(exchange); newMessage.setBody(o); exchange.setMessage(newMessage); async.done(false); } ); return 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-spring-boot] cunningt opened a new pull request, #671: CAMEL-18746 Add missing debezium db2/oracle starters (3.18.x LTS)
cunningt opened a new pull request, #671: URL: https://github.com/apache/camel-spring-boot/pull/671 https://issues.apache.org/jira/browse/CAMEL-18746 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus merged pull request #8759: allow ES modules in JS DSL
davsclaus merged PR #8759: URL: https://github.com/apache/camel/pull/8759 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org