[GitHub] [camel-k] squakez closed issue #3766: Deprecated Github actions / warnings
squakez closed issue #3766: Deprecated Github actions / warnings URL: https://github.com/apache/camel-k/issues/3766 -- 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] johbossle commented on pull request #10505: Add possibility to override LRAClient
johbossle commented on PR #10505:
URL: https://github.com/apache/camel/pull/10505#issuecomment-1610864712
Just want to end up here with an example usage pattern to supply custom
authentication header:
```java
public class AuthenticatingLRASagaService extends LRASagaService {
@Override
protected LRAClient createLRAClient() {
return new LRAClient(this, HttpClient.newBuilder().build()){
@Override
protected HttpRequest.Builder prepareRequest(URI uri) {
HttpRequest.Builder builder = super.prepareRequest(uri);
builder.header("Authentication", "MY_TOKEN");
return builder;
}
};
}
}
```
--
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] squakez commented on pull request #4483: feat: remove the need for a storage
squakez commented on PR #4483: URL: https://github.com/apache/camel-k/pull/4483#issuecomment-1610863573 @gansheer FYI, this is merged -- 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 (c1ead634f -> e45d26b3d)
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 c1ead634f chore: nightly SBOM refresh new 0dcf48672 feat: remove the need for a storage new f6fa287c6 doc: maven proxy configuration new 5e83a2541 fix: temporary switch to root new 14f0040eb chore(deps): align spectrum new 3ec31d49e feat: user 1001 new d61f7da7b fix(traits): set native build also when Kit native new e45d26b3d fix(builder): fallback to strategy to pod when Buildah/Kaniko 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: build/Dockerfile | 17 ++--- config/manager/kustomization.yaml | 4 - config/manager/operator-pvc.yaml | 30 config/manager/patch-install-default-pvc.yaml | 28 --- .../bases/camel_v1_integrationplatform.yaml| 3 - .../ROOT/pages/installation/advanced/advanced.adoc | 35 - .../pages/installation/advanced/maven-proxy.adoc | 66 + .../ROOT/pages/installation/advanced/maven.adoc| 55 ++ e2e/common/traits/builder_test.go | 9 ++- e2e/commonwithcustominstall/builder_test.go| 22 +- .../incremental_build_test.go | 54 +- e2e/commonwithcustominstall/tekton_test.go | 2 +- e2e/install/cli/install_test.go| 13 e2e/install/kustomize/operator_test.go | 2 - e2e/install/kustomize/uninstall_test.go| 3 +- e2e/install/olm/olm_install_test.go| 86 -- e2e/support/test_support.go| 19 - go.mod | 3 +- go.sum | 3 - install/Makefile | 7 -- pkg/apis/camel/v1/common_types.go | 9 ++- pkg/cmd/install.go | 18 - pkg/cmd/install_test.go| 39 -- pkg/controller/build/build_pod.go | 37 -- pkg/controller/catalog/initialize.go | 28 --- pkg/controller/integrationkit/build.go | 15 +--- pkg/install/operator.go| 81 pkg/install/optional.go| 11 --- pkg/platform/defaults.go | 13 +++- pkg/resources/resources.go | 33 + pkg/trait/builder.go | 8 +- pkg/util/defaults/defaults.go | 5 +- script/Makefile| 8 +- 33 files changed, 272 insertions(+), 494 deletions(-) delete mode 100644 config/manager/operator-pvc.yaml delete mode 100644 config/manager/patch-install-default-pvc.yaml create mode 100644 docs/modules/ROOT/pages/installation/advanced/maven-proxy.adoc
[camel-k] 02/07: doc: maven proxy configuration
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 f6fa287c61c5aaad31957c21015bf05ceeafc31b Author: Pasquale Congiusti AuthorDate: Wed Jun 14 11:02:56 2023 +0200 doc: maven proxy configuration --- .../ROOT/pages/installation/advanced/advanced.adoc | 35 +--- .../pages/installation/advanced/maven-proxy.adoc | 66 ++ .../ROOT/pages/installation/advanced/maven.adoc| 55 +- 3 files changed, 120 insertions(+), 36 deletions(-) diff --git a/docs/modules/ROOT/pages/installation/advanced/advanced.adoc b/docs/modules/ROOT/pages/installation/advanced/advanced.adoc index 2303b193b..c34e804d6 100644 --- a/docs/modules/ROOT/pages/installation/advanced/advanced.adoc +++ b/docs/modules/ROOT/pages/installation/advanced/advanced.adoc @@ -3,18 +3,6 @@ Camel K Operators offers several possibility of customization. The default installation could be good in the most of the cases, but, we have a series of configuration that can be applied when you want to fine tune your Camel K operator and get the very best of it. The following settings will work for an installation via `kamel` CLI, but the same configuration could be done with the other xref:installation/installation.adoc[installation procedures] by applying the required changes on the [...] -[[storage]] -== Storage - -Since version 2.0, Camel K requires some persistent storage. You can change the storage configuration using the following settings: - -``` ---storage If false, it won't use a persistent storage (recommended for development purpose only) (default true) ---storage-access-mode string Persistent Volume Access Mode (any of ReadWriteOnce, ReadOnlyMany, ReadWriteMany or ReadWriteOncePod)(default "ReadWriteOnce") ---storage-capacity string How much capacity to use (default "20Gi") ---storage-class-name string Use a storage class name to create a dynamic volume (if empty will look up for cluster default) -``` - [[resources]] == Resource management @@ -52,17 +40,20 @@ A very important set of configuration you can provide is related to Maven: ``` You can learn more in details in the xref:installation/advanced/maven.adoc[Maven configuration] page. -Finally, you can change the registry where to host your integration containers: +[[publish-configuration]] +== Publish configuration + +Camel K requires a container registry where to store the applications built. These are the main configurations: ``` ---organization string A organization on the Docker registry that can be used to publish images ---registry string A Docker registry that can be used to publish images ---registry-auth-file string A docker registry configuration file containing authorization tokens for pushing and pulling images ---registry-auth-password string The docker registry authentication password ---registry-auth-server string The docker registry authentication server ---registry-auth-username string The docker registry authentication username ---registry-insecure Configure to configure registry access in insecure mode or not ---registry-secret string A secret used to push/pull images to the Docker registry +--organization string A organization on the Docker Hub that can be used to publish images +--registry string A container registry that can be used to publish images +--registry-auth-file string A container registry configuration file containing authorization tokens for pushing and pulling images +--registry-auth-password string The container registry authentication password +--registry-auth-server string The container registry authentication server +--registry-auth-username string The container registry authentication username +--registry-insecure Configure registry access in insecure mode or not (`http` vs `https`) +--registry-secret string A secret used to push/pull images to the container registry ``` We have a dedicated section to explain more in details xref:installation/registry/registry.adoc[how to configure a registry]. @@ -85,4 +76,4 @@ We have also certain configuration that let you control how to deploy your Camel --global Configure the operator to watch all namespaces. No integration platform is created. You can run integrations in a namespace by installing an integration platform: 'kamel install --skip-operator-setup -n my-namespace' --operator-id string Set the operator id that is
[camel-k] 05/07: feat: user 1001
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 3ec31d49ee290d22f341389bba149009a25b6748
Author: Pasquale Congiusti
AuthorDate: Tue Jun 20 18:41:56 2023 +0200
feat: user 1001
This is the one used in the builder image
---
build/Dockerfile | 10 ++--
.../bases/camel_v1_integrationplatform.yaml| 3 --
e2e/common/traits/builder_test.go | 9 ++--
e2e/commonwithcustominstall/builder_test.go| 2 +-
.../incremental_build_test.go | 54 +-
e2e/install/kustomize/uninstall_test.go| 3 +-
go.mod | 2 +-
go.sum | 4 +-
pkg/controller/build/build_pod.go | 13 +++---
pkg/controller/catalog/initialize.go | 4 +-
pkg/platform/defaults.go | 2 +-
pkg/util/defaults/defaults.go | 2 +-
script/Makefile| 2 +-
13 files changed, 83 insertions(+), 27 deletions(-)
diff --git a/build/Dockerfile b/build/Dockerfile
index cd66cc6ab..92efe413b 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -45,14 +45,14 @@ ENV MAVEN_OPTS="${MAVEN_OPTS}
-Dlogback.configurationFile=${MAVEN_HOME}/conf/log
ADD build/_maven_output ${MVN_REPO}
ADD build/_kamelets /kamelets
-RUN chgrp -R 0 ${MVN_REPO} \
-&& chmod -R g=u ${MVN_REPO} \
+RUN chgrp -R 1001 ${MVN_REPO} \
+&& chown -R 1001 ${MVN_REPO} \
&& chgrp -R 0 /kamelets \
&& chmod -R g=u /kamelets \
-&& chgrp -R 0 ${MAVEN_HOME} \
-&& chmod -R g=u ${MAVEN_HOME}
+&& chgrp -R 1001 ${MAVEN_HOME} \
+&& chown -R 1001 ${MAVEN_HOME}
-USER 1000
+USER 1001
ADD build/_output/bin/kamel /usr/local/bin/kamel
diff --git a/config/samples/bases/camel_v1_integrationplatform.yaml
b/config/samples/bases/camel_v1_integrationplatform.yaml
index fe0440802..30c582628 100644
--- a/config/samples/bases/camel_v1_integrationplatform.yaml
+++ b/config/samples/bases/camel_v1_integrationplatform.yaml
@@ -22,6 +22,3 @@ metadata:
labels:
app: "camel-k"
spec:
- build:
-buildConfiguration:
- strategy: pod
diff --git a/e2e/common/traits/builder_test.go
b/e2e/common/traits/builder_test.go
index da8e6f39b..f876a2445 100644
--- a/e2e/common/traits/builder_test.go
+++ b/e2e/common/traits/builder_test.go
@@ -70,6 +70,7 @@ func TestBuilderTrait(t *testing.T) {
"-t", "builder.limit-cpu=1000m",
"-t", "builder.request-memory=2Gi",
"-t", "builder.limit-memory=3Gi",
+ "-t", "builder.strategy=pod",
).Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, name),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
@@ -101,10 +102,11 @@ func TestBuilderTrait(t *testing.T) {
"--name", name,
"-t", "builder.tasks=custom1;alpine;tree",
"-t", "builder.tasks=custom2;alpine;cat maven/pom.xml",
+ "-t", "builder.strategy=pod",
).Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, name),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name,
v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationConditionStatus(ns, name,
v1.IntegrationConditionReady),
TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
Eventually(IntegrationLogs(ns, name),
TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationKitName := IntegrationKit(ns, name)()
@@ -144,13 +146,14 @@ func TestBuilderTrait(t *testing.T) {
Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
"--name", name,
"-t", "builder.tasks=custom1;alpine;cat
missingfile.txt",
+ "-t", "builder.strategy=pod",
).Execute()).To(Succeed())
Eventually(IntegrationPhase(ns,
name)).Should(Equal(v1.IntegrationPhaseBuildingKit))
integrationKitName := IntegrationKit(ns, name)()
// Check containers conditions
- Eventually(Build(ns, integrationKitName),
TestTimeoutShort).ShouldNot(BeNil())
- Eventually(BuildConditions(ns, integrationKitName),
TestTimeoutShort).ShouldNot(BeNil())
+ Eventually(Build(ns, integrationKitName),
TestTimeoutLong).ShouldNot(BeNil())
+ Eventually(BuildConditions(ns, integrationKitName),
TestTimeoutLong).ShouldNot(BeNil())
Eventually(
Build(ns,
integrationKitName)().Status.GetCon
[GitHub] [camel-k] squakez commented on pull request #4483: feat: remove the need for a storage
squakez commented on PR #4483: URL: https://github.com/apache/camel-k/pull/4483#issuecomment-1610863110 The failing check did not fail on previous attempt, merging. -- 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] 07/07: fix(builder): fallback to strategy to pod when Buildah/Kaniko
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 e45d26b3d10eed5dc56e9791653580363985393d
Author: Pasquale Congiusti
AuthorDate: Tue Jun 27 14:33:12 2023 +0200
fix(builder): fallback to strategy to pod when Buildah/Kaniko
---
pkg/platform/defaults.go | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/pkg/platform/defaults.go b/pkg/platform/defaults.go
index 8f694f48f..7504c195b 100644
--- a/pkg/platform/defaults.go
+++ b/pkg/platform/defaults.go
@@ -82,7 +82,18 @@ func ConfigureDefaults(ctx context.Context, c client.Client,
p *v1.IntegrationPl
}
if p.Status.Build.BuildConfiguration.Strategy == "" {
- p.Status.Build.BuildConfiguration.Strategy =
v1.BuildStrategyRoutine
+ defaultStrategy := v1.BuildStrategyRoutine
+ if p.Status.Build.PublishStrategy ==
v1.IntegrationPlatformBuildPublishStrategyBuildah ||
+ p.Status.Build.PublishStrategy ==
v1.IntegrationPlatformBuildPublishStrategyKaniko {
+ defaultStrategy = v1.BuildStrategyPod
+ log.Infof("Integration Platform %s [%s]: setting
fallback build strategy %s because PublishStrategy is configured as %s",
+ p.Name,
+ p.Namespace,
+ defaultStrategy,
+ p.Status.Build.PublishStrategy,
+ )
+ }
+ p.Status.Build.BuildConfiguration.Strategy = defaultStrategy
log.Debugf("Integration Platform %s [%s]: setting build
strategy %s", p.Name, p.Namespace, p.Status.Build.BuildConfiguration.Strategy)
}
[camel-k] 04/07: chore(deps): align spectrum
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 14f0040eb38ab43cda77350c2ee1ffa08e5dbd7d
Author: Pasquale Congiusti
AuthorDate: Wed Jun 14 16:33:32 2023 +0200
chore(deps): align spectrum
---
go.mod | 2 +-
go.sum | 4 ++--
pkg/controller/catalog/initialize.go | 10 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/go.mod b/go.mod
index c3217853f..684067128 100644
--- a/go.mod
+++ b/go.mod
@@ -12,7 +12,6 @@ require (
github.com/fsnotify/fsnotify v1.6.0
github.com/gertd/go-pluralize v0.2.1
github.com/go-logr/logr v1.2.4
- github.com/google/go-containerregistry v0.15.2
github.com/google/go-github/v52 v52.0.0
github.com/google/uuid v1.3.0
github.com/jpillora/backoff v1.0.0
@@ -101,6 +100,7 @@ require (
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-cmp v0.5.9 // indirect
+ github.com/google/go-containerregistry v0.13.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
diff --git a/go.sum b/go.sum
index 0f49ed9cb..4fffd419c 100644
--- a/go.sum
+++ b/go.sum
@@ -333,8 +333,8 @@ github.com/google/go-cmp v0.5.5/go.mod
h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.5.6/go.mod
h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod
h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-containerregistry v0.15.2
h1:MMkSh+tjSdnmJZO7ljvEqV1DjfekB6VUEAZgy3a+TQE=
-github.com/google/go-containerregistry v0.15.2/go.mod
h1:wWK+LnOv4jXMM23IT/F1wdYftGWGr47Is8CG+pmHK1Q=
+github.com/google/go-containerregistry v0.13.0
h1:y1C7Z3e149OJbOPDBxLYR8ITPz8dTKqQwjErKVHJC8k=
+github.com/google/go-containerregistry v0.13.0/go.mod
h1:J9FQ+eSS4a1aC2GNZxvNpbWhgp0487v+cgiilB4FqDo=
github.com/google/go-github/v52 v52.0.0
h1:uyGWOY+jMQ8GVGSX8dkSwCzlehU3WfdxQ7GweO/JP7M=
github.com/google/go-github/v52 v52.0.0/go.mod
h1:WJV6VEEUPuMo5pXqqa2ZCZEdbQqua4zAk2MZTIo+m+4=
github.com/google/go-querystring v1.1.0
h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
diff --git a/pkg/controller/catalog/initialize.go
b/pkg/controller/catalog/initialize.go
index d21c1667f..c21dd73c7 100644
--- a/pkg/controller/catalog/initialize.go
+++ b/pkg/controller/catalog/initialize.go
@@ -42,7 +42,6 @@ import (
"github.com/apache/camel-k/v2/pkg/util/s2i"
spectrum "github.com/container-tools/spectrum/pkg/builder"
- gcrv1 "github.com/google/go-containerregistry/pkg/v1"
buildv1 "github.com/openshift/api/build/v1"
imagev1 "github.com/openshift/api/image/v1"
@@ -179,6 +178,7 @@ func initializeS2i(ctx context.Context, c client.Client, ip
*v1.IntegrationPlatf
USER 1000
ADD /usr/local/bin/kamel /usr/local/bin/kamel
ADD /usr/share/maven/mvnw/ /usr/share/maven/mvnw/
+ ADD ` + defaults.LocalRepository + ` ` +
defaults.LocalRepository + `
`))
owner := catalogReference(catalog)
@@ -383,13 +383,13 @@ func imageExistsSpectrum(options spectrum.Options) bool {
Log.Infof("Checking if Camel K builder container %s already exists...",
options.Base)
ctrImg, err := spectrum.Pull(options)
if ctrImg != nil && err == nil {
- var hash gcrv1.Hash
- if hash, err = ctrImg.Digest(); err != nil {
+ if hash, err := ctrImg.Digest(); err != nil {
Log.Errorf(err, "Cannot calculate digest")
return false
+ } else {
+ Log.Infof("Found Camel K builder container with digest
%s", hash.String())
+ return true
}
- Log.Infof("Found Camel K builder container with digest %s",
hash.String())
- return true
}
Log.Infof("Couldn't pull image due to %s", err.Error())
[camel-k] 06/07: fix(traits): set native build also when Kit native
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 d61f7da75d3f3326978514f5ad18213570a8
Author: Pasquale Congiusti
AuthorDate: Tue Jun 27 11:21:32 2023 +0200
fix(traits): set native build also when Kit native
---
pkg/trait/builder.go | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/pkg/trait/builder.go b/pkg/trait/builder.go
index 6e583d88c..e8b72419f 100644
--- a/pkg/trait/builder.go
+++ b/pkg/trait/builder.go
@@ -173,8 +173,14 @@ func (t *builderTrait) builderTask(e *Environment)
(*v1.BuilderTask, error) {
}
if trait := e.Catalog.GetTrait(quarkusTraitID); trait != nil {
+ quarkus, ok := trait.(*quarkusTrait)
+ isNativeIntegration := quarkus.isNativeIntegration(e)
+ isNativeKit, err := quarkus.isNativeKit(e)
+ if err != nil {
+ return nil, err
+ }
// The builder trait must define certain resources requirements
when we have a native build
- if quarkus, ok := trait.(*quarkusTrait); ok &&
pointer.BoolDeref(quarkus.Enabled, true) && quarkus.isNativeIntegration(e) {
+ if ok && pointer.BoolDeref(quarkus.Enabled, true) &&
(isNativeIntegration || isNativeKit) {
// Force the build to run in a separate Pod
t.L.Info("This is a Quarkus native build: setting build
configuration with build Pod strategy, 1 CPU core and 4 GiB memory. Make sure
your cluster can handle it.")
t.Strategy = string(v1.BuildStrategyPod)
[camel-k] 03/07: fix: temporary switch to root
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 5e83a25412409118f1c1290d52cf879fe255fc8f
Author: Pasquale Congiusti
AuthorDate: Wed Jun 14 11:03:13 2023 +0200
fix: temporary switch to root
Ref #4429
---
build/Dockerfile | 11 +--
e2e/commonwithcustominstall/tekton_test.go | 2 +-
e2e/install/cli/install_test.go| 11 ---
go.mod | 1 -
go.sum | 3 ---
install/Makefile | 7 ---
pkg/controller/build/build_pod.go | 17 -
pkg/controller/catalog/initialize.go | 14 +++---
pkg/controller/integrationkit/build.go | 2 --
pkg/install/optional.go| 11 ---
10 files changed, 29 insertions(+), 50 deletions(-)
diff --git a/build/Dockerfile b/build/Dockerfile
index a4efab6b6..cd66cc6ab 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -19,11 +19,13 @@ ARG MAVEN_DEFAULT_VERSION="3.8.6"
ARG MAVEN_HOME="/usr/share/maven"
ARG
MAVEN_DIST_URL="https://archive.apache.org/dist/maven/maven-3/${MAVEN_DEFAULT_VERSION}/binaries/apache-maven-${MAVEN_DEFAULT_VERSION}-bin.zip";
ARG MVNW_DIR="/usr/share/maven/mvnw/"
+ARG MVN_REPO="/etc/maven/m2"
USER 0
# Maven configuration
RUN mkdir -p ${MAVEN_HOME}
+RUN mkdir -p ${MVN_REPO}
COPY build/_maven_overlay/ /usr/share/maven/lib/
ADD build/_maven_overlay/logback.xml /usr/share/maven/conf/
@@ -40,14 +42,11 @@ RUN ${MVNW_DIR}/mvnw --version | grep "Maven home:" | sed
's/Maven home: //' >>
&& rm $(cat ${MVNW_DIR}default)/lib/maven-slf4j-provider*
ENV MAVEN_OPTS="${MAVEN_OPTS}
-Dlogback.configurationFile=${MAVEN_HOME}/conf/logback.xml"
-ADD build/_maven_output /tmp/local/m2
+ADD build/_maven_output ${MVN_REPO}
ADD build/_kamelets /kamelets
-RUN mkdir -p /etc/maven/m2 \
-&& chgrp -R 0 /etc/maven/m2 \
-&& chmod -R g=u /etc/maven/m2 \
-&& chgrp -R 0 /tmp/local/m2 \
-&& chmod -R g=u /tmp/local/m2 \
+RUN chgrp -R 0 ${MVN_REPO} \
+&& chmod -R g=u ${MVN_REPO} \
&& chgrp -R 0 /kamelets \
&& chmod -R g=u /kamelets \
&& chgrp -R 0 ${MAVEN_HOME} \
diff --git a/e2e/commonwithcustominstall/tekton_test.go
b/e2e/commonwithcustominstall/tekton_test.go
index 7179ec6f1..59a724fbc 100644
--- a/e2e/commonwithcustominstall/tekton_test.go
+++ b/e2e/commonwithcustominstall/tekton_test.go
@@ -41,7 +41,7 @@ func TestTektonLikeBehavior(t *testing.T) {
Expect(CreateOperatorRoleBinding(ns)).To(Succeed())
Eventually(OperatorPod(ns)).Should(BeNil())
- Expect(CreateKamelPod(ns, "tekton-task", "install",
"--storage=false", "--skip-cluster-setup", "--force")).To(Succeed())
+ Expect(CreateKamelPod(ns, "tekton-task", "install",
"--skip-cluster-setup", "--force")).To(Succeed())
Eventually(OperatorPod(ns)).ShouldNot(BeNil())
})
diff --git a/e2e/install/cli/install_test.go b/e2e/install/cli/install_test.go
index 5e7f40a2d..d39d104c6 100644
--- a/e2e/install/cli/install_test.go
+++ b/e2e/install/cli/install_test.go
@@ -98,17 +98,6 @@ func TestBasicInstallation(t *testing.T) {
})
}
-func TestEphemeralInstallation(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
- operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(operatorID, ns,
"--storage=false").Execute()).To(Succeed())
- Eventually(OperatorPod(ns)).ShouldNot(BeNil())
- Eventually(Platform(ns)).ShouldNot(BeNil())
- Eventually(PlatformConditionStatus(ns,
v1.IntegrationPlatformConditionReady), TestTimeoutShort).
- Should(Equal(corev1.ConditionTrue))
- })
-}
-
func TestAlternativeImageInstallation(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
diff --git a/go.mod b/go.mod
index 14ffd2d83..c3217853f 100644
--- a/go.mod
+++ b/go.mod
@@ -22,7 +22,6 @@ require (
github.com/onsi/gomega v1.27.8
github.com/openshift/api
v3.9.1-0.20190927182313-d4a64ec2cbd8+incompatible
github.com/operator-framework/api v0.13.0
- github.com/otiai10/copy v1.12.0
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring
v0.60.0
github.com/prometheus/client_golang v1.16.0
github.com/prometheus/client_model v0.4.0
diff --git a/go.sum b/go.sum
index a40f59fd7..0f49ed9cb 100644
--- a/go.sum
+++ b/go.sum
@@ -552,9 +552,6 @@ github.com/openshift/api
v3.9.1-0.20190927182313-d4a64ec2cbd8+incompatible/go.mo
github.com/opentracing/opentracing-go v1.1.0/go.mod
h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
github.com/operator-framework/api v0.13.0
h1:V1vUluRwajSBdDPCnzgTWDnn5LYxLk66VPVGMw3B7Uc=
[camel-k] 01/07: feat: remove the need for a storage
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 0dcf48672b67a45f3dbd582fbb1c57e8f38d7927 Author: Pasquale Congiusti AuthorDate: Tue Jun 13 12:16:22 2023 +0200 feat: remove the need for a storage --- config/manager/kustomization.yaml | 4 -- config/manager/operator-pvc.yaml | 30 -- config/manager/patch-install-default-pvc.yaml | 28 - e2e/commonwithcustominstall/builder_test.go | 20 --- e2e/install/cli/install_test.go | 2 - e2e/install/kustomize/operator_test.go| 2 - e2e/install/olm/olm_install_test.go | 86 --- e2e/support/test_support.go | 19 -- pkg/apis/camel/v1/common_types.go | 9 ++- pkg/cmd/install.go| 18 -- pkg/cmd/install_test.go | 39 pkg/controller/build/build_pod.go | 19 -- pkg/controller/integrationkit/build.go| 13 +--- pkg/install/operator.go | 81 - pkg/resources/resources.go| 33 +- pkg/util/defaults/defaults.go | 3 - script/Makefile | 6 +- 17 files changed, 27 insertions(+), 385 deletions(-) diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 6f98412bc..38c67427f 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -19,7 +19,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- operator-pvc.yaml - operator-deployment.yaml - operator-service-account.yaml @@ -31,6 +30,3 @@ patches: - path: patch-log-level.yaml target: kind: Deployment -- path: patch-install-default-pvc.yaml - target: -kind: Deployment diff --git a/config/manager/operator-pvc.yaml b/config/manager/operator-pvc.yaml deleted file mode 100644 index 6541740a3..0 --- a/config/manager/operator-pvc.yaml +++ /dev/null @@ -1,30 +0,0 @@ -# --- -# 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. -# --- - -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: camel-k-pvc - labels: -app: "camel-k" -spec: - accessModes: - - ReadWriteOnce - resources: -requests: - storage: 20Gi - storageClassName: standard diff --git a/config/manager/patch-install-default-pvc.yaml b/config/manager/patch-install-default-pvc.yaml deleted file mode 100644 index c4f8990b2..0 --- a/config/manager/patch-install-default-pvc.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# --- -# 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. -# --- - -- op: add - path: /spec/template/spec/containers/0/volumeMounts - value: -- name: camel-k-pvc - mountPath: /etc/maven/m2 -- op: add - path: /spec/template/spec/volumes - value: -- name: camel-k-pvc - persistentVolumeClaim: -claimName: camel-k-pvc diff --git a/e2e/commonwithcustominstall/builder_test.go b/e2e/commonwithcustominstall/builder_test.go index 05c6d188d..245eb160f 100644 --- a/e2e/commonwithcustomi
[GitHub] [camel-k] squakez closed issue #4429: Use maven distribution available in the operator image
squakez closed issue #4429: Use maven distribution available in the operator image URL: https://github.com/apache/camel-k/issues/4429 -- 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] squakez merged pull request #4483: feat: remove the need for a storage
squakez merged PR #4483: URL: https://github.com/apache/camel-k/pull/4483 -- 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 (38e70d294cb -> fe9484bf523)
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 38e70d294cb Polished add fe9484bf523 Upgrade to vertx 4.4.4 No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel] branch main updated: Upgrade to vertx 4.4.4
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 fe9484bf523 Upgrade to vertx 4.4.4 fe9484bf523 is described below commit fe9484bf5236f7af665c35cc7ed29527def8fe48 Author: Claus Ibsen AuthorDate: Wed Jun 28 08:30:44 2023 +0200 Upgrade to vertx 4.4.4 --- 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 a65c6cbc128..ba7045ad1bb 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -449,7 +449,7 @@ 0.10.4 3.1 2.3 -4.4.2 +4.4.4 0.7 0.8.0 3.6.0 diff --git a/parent/pom.xml b/parent/pom.xml index 15c63e06dc3..4a17c23cae0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -472,7 +472,7 @@ 0.10.4 3.1 2.3 -4.4.2 +4.4.4 0.7 3.6.0 0.8.0
[GitHub] [camel-quarkus] jamesnetherton commented on a diff in pull request #5019: Micrometer: Custom registry coverage is missing #5018
jamesnetherton commented on code in PR #5019:
URL: https://github.com/apache/camel-quarkus/pull/5019#discussion_r1244734671
##
integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerProducers.java:
##
@@ -64,4 +67,16 @@ public Meter.Id map(Meter.Id id) {
};
}
+@Singleton
+@Produces
Review Comment:
Nitpick - That's the JAX-RS `@Produces`, not the CDI one.
--
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 (2e5733611fb -> 38e70d294cb)
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 2e5733611fb Regen add 38e70d294cb Polished No new revisions were added by this update. Summary of changes: .../org/apache/camel/dsl/jbang/core/commands/process/StopProcess.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel] branch main updated: Polished
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 38e70d294cb Polished
38e70d294cb is described below
commit 38e70d294cb7fbb647604853535579d47d04d1d6
Author: Claus Ibsen
AuthorDate: Wed Jun 28 08:00:36 2023 +0200
Polished
---
.../org/apache/camel/dsl/jbang/core/commands/process/StopProcess.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/StopProcess.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/StopProcess.java
index 4ef6e82332f..741396875a3 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/StopProcess.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/StopProcess.java
@@ -27,7 +27,7 @@ import picocli.CommandLine.Command;
@Command(name = "stop", description = "Shuts down running Camel integrations")
public class StopProcess extends ProcessBaseCommand {
-@CommandLine.Parameters(description = "Name or pid of running Camel
integration", arity = "0..1")
+@CommandLine.Parameters(description = "Name or pid of running Camel
integration(s)", arity = "0..1")
String name = "*";
@CommandLine.Option(names = { "--kill" },
[camel-quarkus] branch quarkus-main updated (6fe51f12c1 -> 3906b057d2)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
discard 6fe51f12c1 Upgrade Quarkus to 3.3.0.CR1
add d921f1ba88 Revert "Disable cxf-soap-grouped native profile due to
#5008"
add a6819a556b Upgrade to quarkus-cxf 2.2.0.CR1
add 2c24b19ce4 Workaround heap out of memory failures on GitHub actions
add 0a765ca336 Fix #5016 to add a IBMMQ pooling test with
quarkus-pooled-jms (#5017)
new 3906b057d2 Upgrade Quarkus to 3.3.0.CR1
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 (6fe51f12c1)
\
N -- N -- N refs/heads/quarkus-main (3906b057d2)
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:
.../src/main/resources/application.properties | 3 +
integration-tests/cxf-soap-grouped/pom.xml | 2 -
integration-tests/jms-ibmmq-client/pom.xml | 7 +-
...QProducers.java => IBMMQConnectionFactory.java} | 26 +-
.../src/main/resources/application.properties | 6 +-
.../it/{IBMMQTest.java => IBMMQPoolingTest.java} | 25 +-
.../quarkus/component/jms/ibmmq/it/IBMMQTest.java | 2 +-
.../component/jms/ibmmq}/it/JmsPoolingEnabled.java | 2 +-
pom.xml| 4 +-
poms/bom/src/main/generated/flattened-full-pom.xml | 464 ++---
.../src/main/generated/flattened-reduced-pom.xml | 108 ++---
.../generated/flattened-reduced-verbose-pom.xml| 464 ++---
12 files changed, 553 insertions(+), 560 deletions(-)
rename
integration-tests/jms-ibmmq-client/src/main/java/org/apache/camel/quarkus/component/jms/ibmmq/it/{IBMMQProducers.java
=> IBMMQConnectionFactory.java} (58%)
copy integration-tests/{core-discovery-disabled =>
jms-ibmmq-client}/src/main/resources/application.properties (92%)
copy
integration-tests/jms-ibmmq-client/src/test/java/org/apache/camel/quarkus/component/jms/ibmmq/it/{IBMMQTest.java
=> IBMMQPoolingTest.java} (82%)
copy
integration-tests/{jms-artemis-client/src/test/java/org/apache/camel/quarkus/component/jms/artemis
=>
jms-ibmmq-client/src/test/java/org/apache/camel/quarkus/component/jms/ibmmq}/it/JmsPoolingEnabled.java
(95%)
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2926: [CI] - Quarkus Main Branch Build Failure
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-1610773760 Build fixed with: * Camel Quarkus Commit: 3906b057d236cdf8be41a0e498fd86d9bf767909 * Quarkus Main Commit: 0a765ca336482090e260c918c034320176895ef5 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/5396604140 -- 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] 01/01: Upgrade Quarkus to 3.3.0.CR1
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 3906b057d236cdf8be41a0e498fd86d9bf767909
Author: James Netherton
AuthorDate: Mon Jun 26 06:43:18 2023 +0100
Upgrade Quarkus to 3.3.0.CR1
---
docs/antora.yml| 2 +-
.../ROOT/pages/reference/extensions/core.adoc | 76 +++---
.../ROOT/pages/reference/extensions/kamelet.adoc | 3 +-
.../pages/reference/extensions/opentelemetry.adoc | 12 +++-
pom.xml| 2 +-
5 files changed, 65 insertions(+), 30 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index bd94cfd27a..001cce4822 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -30,7 +30,7 @@ asciidoc:
# Project versions
camel-version: 4.0.0-M3 # replace ${camel.version}
camel-docs-version: ""
-quarkus-version: 3.2.0.CR1 # replace ${quarkus.version}
+quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
graalvm-version: 22.3.2 # replace ${graalvm.version}
graalvm-docs-version: 22.3
min-maven-version: 3.8.2 # replace ${min-maven-version}
diff --git a/docs/modules/ROOT/pages/reference/extensions/core.adoc
b/docs/modules/ROOT/pages/reference/extensions/core.adoc
index 075d04dc79..bb6b9f352e 100644
--- a/docs/modules/ROOT/pages/reference/extensions/core.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/core.adoc
@@ -137,60 +137,72 @@ When set to true, the `CamelRuntime` will be started
automatically.
|icon:lock[title=Fixed at build time]
[[quarkus.camel.service.discovery.exclude-patterns]]`link:#quarkus.camel.service.discovery.exclude-patterns[quarkus.camel.service.discovery.exclude-patterns]`
-A comma-separated list of Ant-path style patterns to match Camel service
definition files in the classpath. The services defined in the matching files
will *not* be discoverable via the **`org.apache.camel.spi.FactoryFinder`
mechanism.
-The excludes have higher precedence than includes. The excludes defined here
can also be used to veto the discoverability of services included by Camel
Quarkus extensions.
+A comma-separated list of Ant-path style patterns to match Camel service
definition files in the classpath. The services defined in the matching files
will *not* be discoverable via the **`org.apache.camel.spi.FactoryFinder`
mechanism.
+
+The excludes have higher precedence than includes. The excludes defined here
can also be used to veto the discoverability of services included by Camel
Quarkus extensions.
+
Example values:
`META-INF/services/org/apache/camel/foo/++*++,META-INF/services/org/apache/camel/foo/++**++/bar`
| `string`
|
|icon:lock[title=Fixed at build time]
[[quarkus.camel.service.discovery.include-patterns]]`link:#quarkus.camel.service.discovery.include-patterns[quarkus.camel.service.discovery.include-patterns]`
-A comma-separated list of Ant-path style patterns to match Camel service
definition files in the classpath. The services defined in the matching files
will be discoverable via the `org.apache.camel.spi.FactoryFinder` mechanism
unless the given file is excluded via `exclude-patterns`.
-Note that Camel Quarkus extensions may include some services by default. The
services selected here added to those services and the exclusions defined in
`exclude-patterns` are applied to the union set.
+A comma-separated list of Ant-path style patterns to match Camel service
definition files in the classpath. The services defined in the matching files
will be discoverable via the `org.apache.camel.spi.FactoryFinder` mechanism
unless the given file is excluded via `exclude-patterns`.
+
+Note that Camel Quarkus extensions may include some services by default. The
services selected here added to those services and the exclusions defined in
`exclude-patterns` are applied to the union set.
+
Example values:
`META-INF/services/org/apache/camel/foo/++*++,META-INF/services/org/apache/camel/foo/++**++/bar`
| `string`
|
|icon:lock[title=Fixed at build time]
[[quarkus.camel.service.registry.exclude-patterns]]`link:#quarkus.camel.service.registry.exclude-patterns[quarkus.camel.service.registry.exclude-patterns]`
-A comma-separated list of Ant-path style patterns to match Camel service
definition files in the classpath. The services defined in the matching files
will *not* be added to Camel registry during application's static
initialization.
-The excludes have higher precedence than includes. The excludes defined here
can also be used to veto the registration of services included by Camel Quarkus
extensions.
+A comma-separated list of Ant-path style patterns to match Camel service
definition files in the classpath. The services defined in the matching files
will *not* be added to Camel registry during application's static
initialization.
+
+The excludes have
[GitHub] [camel-quarkus] github-actions[bot] closed issue #2926: [CI] - Quarkus Main Branch Build Failure
github-actions[bot] closed issue #2926: [CI] - Quarkus Main Branch Build Failure URL: https://github.com/apache/camel-quarkus/issues/2926 -- 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] srikanthprathipati closed issue #4398: kamel run | custom dependencies | local files | K8S Cluster with GHCR
srikanthprathipati closed issue #4398: kamel run | custom dependencies | local files | K8S Cluster with GHCR URL: https://github.com/apache/camel-k/issues/4398 -- 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
Error while running github feature from .asf.yaml in camel-website-pub!
An error occurred while running github feature in .asf.yaml!:
422 {"message": "Validation Failed", "errors": [{"message": "Sorry, you need to
allow at least one merge strategy. (no_merge_method)", "resource":
"Repository", "field": "merge_commit_allowed", "code": "invalid"}],
"documentation_url":
"https://docs.github.com/rest/repos/repos#update-a-repository"}
[camel-website-pub] branch asf-site updated (f0c5cc6c33 -> 658262dd3e)
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website-pub.git discard f0c5cc6c33 Website updated to 8d32161a7bb2b3b659b6c31f0df414ad6c1be386 discard ac86df5fce Website updated to 325e929157412b27394080f4d4dba3d821476ddf new 7994e099ef Website updated to 325e929157412b27394080f4d4dba3d821476ddf new 658262dd3e Website updated to 2eb330362ad9eeccb72638e9193a3a72f0857d3c 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 (f0c5cc6c33) \ N -- N -- N refs/heads/asf-site (658262dd3e) 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 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: .well-known/security.txt |2 +- camel-core/contributing/building.html |6 + camel-core/contributing/index.html|6 + camel-core/index.html |2 +- camel-k/next/contributing/remote-debugging.html |5 + camel-karaf/next/contributing.html|2 + camel-spring-boot/next/contributing.html |1 + community/contributing/index.html | 21 +- community/index.xml |4 +- components/3.20.x/minio-component.html|4 +- components/next/debezium-db2-component.html |2 +- components/next/debezium-mongodb-component.html |2 +- components/next/debezium-mysql-component.html |2 +- components/next/debezium-oracle-component.html|2 +- components/next/debezium-postgres-component.html |2 +- components/next/debezium-sqlserver-component.html |2 +- components/next/languages/simple-language.html|2 +- components/next/minio-component.html |4 +- download/index.html |2 +- index.xml |4 +- manual/building.html |2 +- site-manifest.json| 32 +- sitemap-camel-core.xml| 16 +- sitemap-camel-k.xml | 984 +-- sitemap-camel-kafka-connector.xml | 790 +-- sitemap-camel-kamelets.xml| 1674 +++--- sitemap-camel-karaf.xml | 66 +- sitemap-camel-quarkus.xml | 4050 ++--- sitemap-camel-spring-boot.xml | 52 +- sitemap-components.xml| 6656 ++--- sitemap-manual.xml| 410 +- 31 files changed, 7428 insertions(+), 7381 deletions(-) create mode 100644 camel-core/contributing/building.html create mode 100644 camel-core/contributing/index.html create mode 100644 camel-k/next/contributing/remote-debugging.html create mode 100644 camel-karaf/next/contributing.html create mode 100644 camel-spring-boot/next/contributing.html
[GitHub] [camel] davsclaus commented on pull request #10487: Manage single version of Guava or avoid it where possible
davsclaus commented on PR #10487: URL: https://github.com/apache/camel/pull/10487#issuecomment-1610675993 LGTM lets merge 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
[camel-website] branch main updated: (chores) doc: reorganize the contributing documentation
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-website.git
The following commit(s) were added to refs/heads/main by this push:
new 2eb33036 (chores) doc: reorganize the contributing documentation
2eb33036 is described below
commit 2eb330362ad9eeccb72638e9193a3a72f0857d3c
Author: Otavio Rodolfo Piske
AuthorDate: Tue Jun 27 08:52:42 2023 +0200
(chores) doc: reorganize the contributing documentation
---
content/camel-core/_index.md | 2 +-
content/community/contributing.md | 186 +++---
content/download/_index.md| 2 +-
3 files changed, 13 insertions(+), 177 deletions(-)
diff --git a/content/camel-core/_index.md b/content/camel-core/_index.md
index f62ef4dd..c5cfc011 100644
--- a/content/camel-core/_index.md
+++ b/content/camel-core/_index.md
@@ -92,7 +92,7 @@ The Apache Camel Core is the foundation for all other
projects. Ideal for experi
Everything you need to know to make a contribution to the Camel
Core project. Learn how to build, test, document and improve the project.
-Learn More
+Learn More
{{< /div >}}
diff --git a/content/community/contributing.md
b/content/community/contributing.md
index ca7b64c9..ce488de7 100644
--- a/content/community/contributing.md
+++ b/content/community/contributing.md
@@ -2,183 +2,19 @@
title: Contributing
---
-## Contributing to Apache Camel
-First of all, thank you for having an interest in contributing to Apache Camel.
+Thank you for expressing your interest in contributing to Apache Camel, a
versatile open-source integration framework. Apache Camel consists of various
sub-projects, each with its own specific contribution guidelines. In order to
ensure a smooth and effective contribution process, it is important to
familiarize yourself with the guidelines specific to the sub-project you intend
to contribute to. Check the pages for each of the sub-projects for details
about how to contribute:
-Here are some guidelines on how to best approach the Apache Camel community
and how to best apply yourself.
-There are many ways you can help make Camel a better piece of software -
please dive in and help!
+* [Camel Core](/camel-core/contributing/)
+* [Camel K](/camel-k/latest/)
+* [Camel Kafka Connector](/camel-kafka-connector/latest/)
+* [Camel Karaf](/camel-karaf/latest/)
+* [Camel Quarkus](/camel-quarkus/latest)
+* [Camel Spring Boot](/camel-spring-boot/latest)
-- Try surfing the documentation - if something confuses you, [bring it to our
attention or suggest an improvement](#working-on-the-documentation).
-- Download the code & try it out and see what you think.
-- Browse the source code. Got an itch to scratch, want to tune some operation,
or add some feature?
-- Want to do some hacking on Camel? Try surfing our [issue
tracker](https://issues.apache.org/jira/browse/CAMEL) for open issues or
features that need to be implemented. Take ownership of a particular issue, and
try to fix it.
-- If you are a new Camel rider and would like to help us, you can also find
[some easy to resolve
issues](https://issues.apache.org/jira/issues/?filter=12348073) or [issues we
need help with](https://issues.apache.org/jira/issues/?filter=12348074).
-- Leave a comment on the issue to let us know you are working on it, and add
yourself as a watcher to get informed about all modifications.
+If in doubt about where to start, check the contributing guide from [Camel
Core](/camel-core/contributing/index.html), which provides the overall
guidelines for the project and contains comprehensive documentation that may
apply for the sub-projects.
-Identify areas you can contribute first. You don't have to be an expert in an
area, the Apache Camel developers are available to offer help and guidance.
+Please note that each sub-project may have its own specific development
process, coding conventions, and contribution workflows. It is crucial to
carefully review the respective guidelines to ensure your contributions align
with each sub-project's standards and expectations.
-Introduce yourself on the [developer's mailing list] (#getting-in-touch), tell
us what area of work or problem you wish to address in Camel. Create a draft of
your solution, this can be simple 1-2 sentences on the change you wish to make.
Try to be as specific as you can: include a short description of your intent,
what you tried and what didn't work, or what you need help with. The best way
of approaching the developers is by describing what you would like to work on
and asking specific [...]
-
-We also participate in Google Summer of Code and Outreachy programs; for
information about those look at those program websites. If you wish to
participate in either of those follow the guidelines and schedule set by those
programs. If you are unsure please reach out via official communication
channels of t
[GitHub] [camel-website] orpiske merged pull request #1018: (chores) doc: updated contributing guide
orpiske merged PR #1018: URL: https://github.com/apache/camel-website/pull/1018 -- 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 main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new f1434577fc Updated CHANGELOG.md f1434577fc is described below commit f1434577fc270c55b06e64a47d872bc381336150 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Jun 28 03:27:20 2023 + Updated CHANGELOG.md --- CHANGELOG.md | 7 +++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2649cc8d14..b63fb823bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,13 @@ [Full Changelog](https://github.com/apache/camel-quarkus/compare/3.0.0-M2...HEAD) +**Implemented enhancements:** + +- Check IBM MQ client is working with quarkus-pooled-jms [\#5016](https://github.com/apache/camel-quarkus/issues/5016) + **Fixed bugs:** +- \[Mandrel 23.0.0\] cxf-soap grouped integration tests native compilation fails [\#5008](https://github.com/apache/camel-quarkus/issues/5008) - \[Quarkus 3.2.0\] io.quarkus.arc.Priority has been removed [\#4983](https://github.com/apache/camel-quarkus/issues/4983) - Unable to generate REST API documentation when lightweight mode is enabled [\#2527](https://github.com/apache/camel-quarkus/issues/2527) @@ -47,6 +52,8 @@ **Merged pull requests:** +- Fix \#5016 to add a IBMMQ pooling test with quarkus-pooled-jms [\#5017](https://github.com/apache/camel-quarkus/pull/5017) ([zhfeng](https://github.com/zhfeng)) +- Upgrade to quarkus-cxf 2.2.0.CR1 [\#5015](https://github.com/apache/camel-quarkus/pull/5015) ([ppalaga](https://github.com/ppalaga)) - Generated sources regen for SBOM [\#5013](https://github.com/apache/camel-quarkus/pull/5013) ([github-actions[bot]](https://github.com/apps/github-actions)) - Upgrade quarkus-amazon-services-bom to 2.3.2 [\#5012](https://github.com/apache/camel-quarkus/pull/5012) ([jamesnetherton](https://github.com/jamesnetherton)) - Disable google-storage native profile due to \#5010 [\#5011](https://github.com/apache/camel-quarkus/pull/5011) ([jamesnetherton](https://github.com/jamesnetherton))
[camel-k-runtime] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git The following commit(s) were added to refs/heads/main by this push: new 2c99ca96 Updated CHANGELOG.md 2c99ca96 is described below commit 2c99ca96e3967ab8afc4b610a433aa515120d500 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Jun 28 03:14:25 2023 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d65edbfe..df8535b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Merged pull requests:** +- Remove camel-k-cloudevents as it is not used in camel-k [\#1055](https://github.com/apache/camel-k-runtime/pull/1055) ([claudio4j](https://github.com/claudio4j)) - Update native image to ubi-quarkus-mandrel-builder-image [\#1054](https://github.com/apache/camel-k-runtime/pull/1054) ([claudio4j](https://github.com/claudio4j)) - Revert "build\(deps\): bump logstash-logback-encoder from 7.3 to 7.4" [\#1053](https://github.com/apache/camel-k-runtime/pull/1053) ([claudio4j](https://github.com/claudio4j)) - build\(deps\): bump logstash-logback-encoder from 7.3 to 7.4 [\#1052](https://github.com/apache/camel-k-runtime/pull/1052) ([dependabot[bot]](https://github.com/apps/dependabot))
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1610416333 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 5395834494-1057-dd2c148b-0cb7-4052-bd06-3e31363501b9 * Camel Quarkus Commit: d574b2df08595e6fa46b20623eb93948f8f7e05b * Camel Main Commit: 2c24b19ce4ab9cc46a9b1dc89583395d66512332 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/5395834494 -- 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 main updated: Fix #5016 to add a IBMMQ pooling test with quarkus-pooled-jms (#5017)
This is an automated email from the ASF dual-hosted git repository.
zhfeng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 0a765ca336 Fix #5016 to add a IBMMQ pooling test with
quarkus-pooled-jms (#5017)
0a765ca336 is described below
commit 0a765ca336482090e260c918c034320176895ef5
Author: Zheng Feng
AuthorDate: Wed Jun 28 08:43:40 2023 +0800
Fix #5016 to add a IBMMQ pooling test with quarkus-pooled-jms (#5017)
---
integration-tests/jms-ibmmq-client/pom.xml | 7 -
...QProducers.java => IBMMQConnectionFactory.java} | 26 -
.../src/main/resources/application.properties | 19 +
.../it/{IBMMQTest.java => IBMMQPoolingTest.java} | 25 ++--
.../quarkus/component/jms/ibmmq/it/IBMMQTest.java | 2 +-
.../component/jms/ibmmq/it/JmsPoolingEnabled.java | 33 ++
6 files changed, 79 insertions(+), 33 deletions(-)
diff --git a/integration-tests/jms-ibmmq-client/pom.xml
b/integration-tests/jms-ibmmq-client/pom.xml
index 6b2861773e..924a004516 100644
--- a/integration-tests/jms-ibmmq-client/pom.xml
+++ b/integration-tests/jms-ibmmq-client/pom.xml
@@ -41,6 +41,12 @@
camel-quarkus-jms
+
+
+io.quarkiverse.messaginghub
+quarkus-pooled-jms
+
+
org.apache.camel.quarkus
@@ -51,7 +57,6 @@
com.ibm.mq
com.ibm.mq.jakarta.client
-provided
diff --git
a/integration-tests/jms-ibmmq-client/src/main/java/org/apache/camel/quarkus/component/jms/ibmmq/it/IBMMQProducers.java
b/integration-tests/jms-ibmmq-client/src/main/java/org/apache/camel/quarkus/component/jms/ibmmq/it/IBMMQConnectionFactory.java
similarity index 58%
rename from
integration-tests/jms-ibmmq-client/src/main/java/org/apache/camel/quarkus/component/jms/ibmmq/it/IBMMQProducers.java
rename to
integration-tests/jms-ibmmq-client/src/main/java/org/apache/camel/quarkus/component/jms/ibmmq/it/IBMMQConnectionFactory.java
index 45b246ea69..fd009b9b63 100644
---
a/integration-tests/jms-ibmmq-client/src/main/java/org/apache/camel/quarkus/component/jms/ibmmq/it/IBMMQProducers.java
+++
b/integration-tests/jms-ibmmq-client/src/main/java/org/apache/camel/quarkus/component/jms/ibmmq/it/IBMMQConnectionFactory.java
@@ -18,27 +18,25 @@ package org.apache.camel.quarkus.component.jms.ibmmq.it;
import com.ibm.mq.jakarta.jms.MQConnectionFactory;
import com.ibm.msg.client.jakarta.wmq.WMQConstants;
-import jakarta.enterprise.inject.Produces;
-import jakarta.jms.ConnectionFactory;
+import jakarta.enterprise.context.Dependent;
import org.eclipse.microprofile.config.ConfigProvider;
-public class IBMMQProducers {
-@Produces
-ConnectionFactory createConnectionFactory() {
-MQConnectionFactory connectionFactory = new MQConnectionFactory();
-
connectionFactory.setHostName(ConfigProvider.getConfig().getValue("ibm.mq.host",
String.class));
+@Dependent
+public class IBMMQConnectionFactory extends MQConnectionFactory {
+
+public IBMMQConnectionFactory() {
+setHostName(ConfigProvider.getConfig().getValue("ibm.mq.host",
String.class));
try {
-
connectionFactory.setPort(ConfigProvider.getConfig().getValue("ibm.mq.port",
Integer.class));
-
connectionFactory.setChannel(ConfigProvider.getConfig().getValue("ibm.mq.channel",
String.class));
-
connectionFactory.setQueueManager(ConfigProvider.getConfig().getValue("ibm.mq.queueManagerName",
String.class));
-connectionFactory.setTransportType(WMQConstants.WMQ_CM_CLIENT);
-connectionFactory.setStringProperty(WMQConstants.USERID,
+setPort(ConfigProvider.getConfig().getValue("ibm.mq.port",
Integer.class));
+setChannel(ConfigProvider.getConfig().getValue("ibm.mq.channel",
String.class));
+
setQueueManager(ConfigProvider.getConfig().getValue("ibm.mq.queueManagerName",
String.class));
+setTransportType(WMQConstants.WMQ_CM_CLIENT);
+setStringProperty(WMQConstants.USERID,
ConfigProvider.getConfig().getValue("ibm.mq.user",
String.class));
-connectionFactory.setStringProperty(WMQConstants.PASSWORD,
+setStringProperty(WMQConstants.PASSWORD,
ConfigProvider.getConfig().getValue("ibm.mq.password",
String.class));
} catch (Exception e) {
throw new RuntimeException("Unable to create new IBM MQ connection
factory", e);
}
-return connectionFactory;
}
}
diff --git
a/integration-tests/jms-ibmmq-client/src/main/resources/application.properties
b/integration-tests/jms-ibmmq-client/src/main/resources/application.properties
new file mode 100644
index 00..b32e2e1086
--- /dev/null
+++
b/integration-tests
[GitHub] [camel-quarkus] zhfeng closed issue #5016: Check IBM MQ client is working with quarkus-pooled-jms
zhfeng closed issue #5016: Check IBM MQ client is working with quarkus-pooled-jms URL: https://github.com/apache/camel-quarkus/issues/5016 -- 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-quarkus] zhfeng merged pull request #5017: Fix #5016 to add a IBMMQ pooling test with quarkus-pooled-jms
zhfeng merged PR #5017: URL: https://github.com/apache/camel-quarkus/pull/5017 -- 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] 01/02: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-1.10.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 8aa38a41f5776c8bff03df3ff86a43c9d94eb78a Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Jun 27 23:42:19 2023 + chore: changelog automatic update --- CHANGELOG.md | 7 +++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a2681a18d..51bc03583 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,15 +6,22 @@ **Closed issues:** +- Allow to remote debug the Operator [\#4513](https://github.com/apache/camel-k/issues/4513) - Updating a property will cause Integration to rebuild [\#4511](https://github.com/apache/camel-k/issues/4511) +- CamelCatalog generated twice [\#4504](https://github.com/apache/camel-k/issues/4504) - Question: use camel dependency version 3.20.3 or higher [\#4502](https://github.com/apache/camel-k/issues/4502) - Problems reading boolean values for traits using comments [\#4493](https://github.com/apache/camel-k/issues/4493) - Alter namespace where the Push of Operator sends the image generated [\#4492](https://github.com/apache/camel-k/issues/4492) - Empty build strategy [\#4485](https://github.com/apache/camel-k/issues/4485) - pod-template with knative in rest integration [\#4484](https://github.com/apache/camel-k/issues/4484) +- Missing license header [\#4469](https://github.com/apache/camel-k/issues/4469) +- Rework CLIs required by operator build process [\#4466](https://github.com/apache/camel-k/issues/4466) +- Horizontal scaling ability for operators [\#4173](https://github.com/apache/camel-k/issues/4173) +- Observability documentation - Update to micrometer extension [\#4157](https://github.com/apache/camel-k/issues/4157) - Helm Node Selector [\#4096](https://github.com/apache/camel-k/issues/4096) - Update the version of the kind-action [\#4063](https://github.com/apache/camel-k/issues/4063) - Onboard Camel K Tekton tasks [\#3795](https://github.com/apache/camel-k/issues/3795) +- Document supported components [\#2228](https://github.com/apache/camel-k/issues/2228) ## [1.12.2-nightly](https://github.com/apache/camel-k/tree/1.12.2-nightly) (2023-06-13)
[camel-k] branch main updated (18edaa554 -> c1ead634f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from 18edaa554 chore(ci): Update github/non github actions new 294ffca19 chore: changelog automatic update new c1ead634f chore: nightly SBOM refresh 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: CHANGELOG.md | 11 + camel-k-sbom/camel-k-sbom.json | 54 +- 2 files changed, 38 insertions(+), 27 deletions(-)
[camel-k] 02/02: Periodic Sync of Camel K Main Branch for SBOM Generation
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch release-1.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit a76e7e082a37f7839abf48940ce6ef8021b42c30
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Jun 27 23:46:27 2023 +
Periodic Sync of Camel K Main Branch for SBOM Generation
---
camel-k-sbom/camel-k-sbom.json | 54 +-
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index 9c71cbd02..676095f8f 100644
--- a/camel-k-sbom/camel-k-sbom.json
+++ b/camel-k-sbom/camel-k-sbom.json
@@ -2,10 +2,10 @@
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json";,
"bomFormat": "CycloneDX",
"specVersion": "1.4",
- "serialNumber": "urn:uuid:ff4d4ad0-2edb-43e4-a743-af69fa7c0a43",
+ "serialNumber": "urn:uuid:7399d6ab-489b-4092-9692-f7812c97e394",
"version": 1,
"metadata": {
-"timestamp": "2023-06-26T23:45:09Z",
+"timestamp": "2023-06-27T23:46:27Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref":
"pkg:golang/github.com/apache/camel-k@v0.0.0-20230626234003-70f3dd2c3db5?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k@v0.0.0-20230627234219-8aa38a41f577?type=module",
"type": "application",
"name": "github.com/apache/camel-k",
- "version": "v0.0.0-20230626234003-70f3dd2c3db5",
- "purl":
"pkg:golang/github.com/apache/camel-k@v0.0.0-20230626234003-70f3dd2c3db5?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20230627234219-8aa38a41f577",
+ "purl":
"pkg:golang/github.com/apache/camel-k@v0.0.0-20230627234219-8aa38a41f577?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k";,
@@ -371,18 +371,18 @@
}
},
{
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230626234003-70f3dd2c3db5?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230627234219-8aa38a41f577?type=module",
"type": "library",
"name": "github.com/apache/camel-k/pkg/apis/camel",
- "version": "v0.0.0-20230626234003-70f3dd2c3db5",
+ "version": "v0.0.0-20230627234219-8aa38a41f577",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content":
"1053362b472a751b1e9f016271a9d0cd4d2a3014b445e0eb47e415e12b7766e9"
+ "content":
"c134971c392b0fe2d89001f5646f86b4b353f84ce32625568e71620883a6d8dd"
}
],
- "purl":
"pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230626234003-70f3dd2c3db5?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl":
"pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230627234219-8aa38a41f577?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k/pkg/apis/camel";,
@@ -391,18 +391,18 @@
]
},
{
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230626234003-70f3dd2c3db5?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230627234219-8aa38a41f577?type=module",
"type": "library",
"name": "github.com/apache/camel-k/pkg/client/camel",
- "version": "v0.0.0-20230626234003-70f3dd2c3db5",
+ "version": "v0.0.0-20230627234219-8aa38a41f577",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content":
"4f9a97f8f8659a35be1fadacb74452d3ed5a6a0b96b2e13454011a0e7d6e075f"
+ "content":
"74c8dc1f0eae46f8a46d880d61b4a5997beb2413823250fcd787fd77160a5190"
}
],
- "purl":
"pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230626234003-70f3dd2c3db5?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl":
"pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230627234219-8aa38a41f577?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k/pkg/client/camel";,
@@ -411,18 +411,18 @@
]
},
{
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/kamelet/repository@v0.0.0-20230626234003-70f3dd2c3db5?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/kamelet/repository@v0.0.0-20230627234219-8aa38a41f577?type=module",
"type": "library",
"name": "github.com/apache/camel-k/pkg/kamelet/repository",
- "version": "v0.0.0-20230626234003-70f3dd2c3db5",
+ "version": "v0.0.0-20230627234219-8aa38a41f577",
"scope": "required",
"hashes": [
{
"alg": "SH
[camel-k] branch release-1.10.x updated (ababbf13d -> a76e7e082)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch release-1.10.x in repository https://gitbox.apache.org/repos/asf/camel-k.git from ababbf13d Periodic Sync of Camel K Main Branch for SBOM Generation new 8aa38a41f chore: changelog automatic update new a76e7e082 Periodic Sync of Camel K Main Branch for SBOM Generation 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: CHANGELOG.md | 7 ++ camel-k-sbom/camel-k-sbom.json | 54 +- 2 files changed, 34 insertions(+), 27 deletions(-)
[camel-k] 02/02: chore: nightly SBOM refresh
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit c1ead634f509b7fc5b3177a327bbce55d7edfe81
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Jun 27 23:46:35 2023 +
chore: nightly SBOM refresh
---
camel-k-sbom/camel-k-sbom.json | 54 +-
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index c5dc8ef70..7033515f2 100644
--- a/camel-k-sbom/camel-k-sbom.json
+++ b/camel-k-sbom/camel-k-sbom.json
@@ -2,10 +2,10 @@
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json";,
"bomFormat": "CycloneDX",
"specVersion": "1.4",
- "serialNumber": "urn:uuid:da468750-09df-48b2-b68b-8b6e5b630e4d",
+ "serialNumber": "urn:uuid:d797ac84-44b9-4052-9187-bc907f94db4b",
"version": 1,
"metadata": {
-"timestamp": "2023-06-26T23:48:01Z",
+"timestamp": "2023-06-27T23:46:35Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230626234733-5d2d3530116f?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230627234239-294ffca19017?type=module",
"type": "application",
"name": "github.com/apache/camel-k/v2",
- "version": "v0.0.0-20230626234733-5d2d3530116f",
- "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230626234733-5d2d3530116f?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20230627234239-294ffca19017",
+ "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230627234239-294ffca19017?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k";,
@@ -423,18 +423,18 @@
}
},
{
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230626234733-5d2d3530116f?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230627234239-294ffca19017?type=module",
"type": "library",
"name": "github.com/apache/camel-k/v2/pkg/apis/camel",
- "version": "v0.0.0-20230626234733-5d2d3530116f",
+ "version": "v0.0.0-20230627234239-294ffca19017",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content":
"582b123d1311802680f6c15e41365114880f193a75c65d858afc257675177c3e"
+ "content":
"8f94cc11d7aa0c5a5a28fbed4fa2abec89542080c09563970192bba5ef0d92c9"
}
],
- "purl":
"pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230626234733-5d2d3530116f?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl":
"pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230627234239-294ffca19017?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k/v2/pkg/apis/camel";,
@@ -443,18 +443,18 @@
]
},
{
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230626234733-5d2d3530116f?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230627234239-294ffca19017?type=module",
"type": "library",
"name": "github.com/apache/camel-k/v2/pkg/client/camel",
- "version": "v0.0.0-20230626234733-5d2d3530116f",
+ "version": "v0.0.0-20230627234239-294ffca19017",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content":
"bf1d9499ad68a42579811de96ca8ab5a0aac526346f7e05e2bc47e2273566141"
+ "content":
"64c0eea2bd451f46c3f7c4346ab50a9bfabcb97aa15eebfa71b4de4bf5ad2631"
}
],
- "purl":
"pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230626234733-5d2d3530116f?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl":
"pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230627234239-294ffca19017?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k/v2/pkg/client/camel";,
@@ -463,18 +463,18 @@
]
},
{
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2/pkg/kamelet/repository@v0.0.0-20230626234733-5d2d3530116f?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2/pkg/kamelet/repository@v0.0.0-20230627234239-294ffca19017?type=module",
"type": "library",
"name": "github.com/apache/camel-k/v2/pkg/kamelet/repository",
- "version": "v0.0.0-20230626234733-5d2d3530116f",
+ "version": "v0.0.0-20230627234239-294ffca19017",
"scope": "required",
"hashes": [
{
[camel-k] 01/02: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 294ffca1901701644ec741e1a8ff158fcc4fab9e Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Jun 27 23:42:39 2023 + chore: changelog automatic update --- CHANGELOG.md | 11 +++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fa80173d..81751ee39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,18 +6,29 @@ **Closed issues:** +- Allow to remote debug the Operator [\#4513](https://github.com/apache/camel-k/issues/4513) - Updating a property will cause Integration to rebuild [\#4511](https://github.com/apache/camel-k/issues/4511) +- CamelCatalog generated twice [\#4504](https://github.com/apache/camel-k/issues/4504) - Question: use camel dependency version 3.20.3 or higher [\#4502](https://github.com/apache/camel-k/issues/4502) - Problems reading boolean values for traits using comments [\#4493](https://github.com/apache/camel-k/issues/4493) - Alter namespace where the Push of Operator sends the image generated [\#4492](https://github.com/apache/camel-k/issues/4492) - Empty build strategy [\#4485](https://github.com/apache/camel-k/issues/4485) - pod-template with knative in rest integration [\#4484](https://github.com/apache/camel-k/issues/4484) +- Missing license header [\#4469](https://github.com/apache/camel-k/issues/4469) +- Rework CLIs required by operator build process [\#4466](https://github.com/apache/camel-k/issues/4466) +- Horizontal scaling ability for operators [\#4173](https://github.com/apache/camel-k/issues/4173) +- Observability documentation - Update to micrometer extension [\#4157](https://github.com/apache/camel-k/issues/4157) - Helm Node Selector [\#4096](https://github.com/apache/camel-k/issues/4096) - Update the version of the kind-action [\#4063](https://github.com/apache/camel-k/issues/4063) - Onboard Camel K Tekton tasks [\#3795](https://github.com/apache/camel-k/issues/3795) +- Document supported components [\#2228](https://github.com/apache/camel-k/issues/2228) **Merged pull requests:** +- chore\(ci\): Upgrade github/non github actions [\#4518](https://github.com/apache/camel-k/pull/4518) ([gansheer](https://github.com/gansheer)) +- Ref \#4513: Allow to remote debug the Operator [\#4517](https://github.com/apache/camel-k/pull/4517) ([essobedo](https://github.com/essobedo)) +- chore\(ci\) : Fix licence missing/invalid format [\#4515](https://github.com/apache/camel-k/pull/4515) ([gansheer](https://github.com/gansheer)) +- fix\(trait\): retrieve non cached version of generated Camel Catalog [\#4514](https://github.com/apache/camel-k/pull/4514) ([squakez](https://github.com/squakez)) - feat\(trait\): add InfluencesBuild\(\) func [\#4512](https://github.com/apache/camel-k/pull/4512) ([squakez](https://github.com/squakez)) - fix\(helm\): proper CRDs [\#4510](https://github.com/apache/camel-k/pull/4510) ([squakez](https://github.com/squakez)) - chore\(deps\): bump github.com/container-tools/spectrum from 0.6.24 to 0.6.25 [\#4509](https://github.com/apache/camel-k/pull/4509) ([dependabot[bot]](https://github.com/apps/dependabot))
[camel-k] branch release-1.12.x updated (cd5d26652 -> f1a66758f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch release-1.12.x in repository https://gitbox.apache.org/repos/asf/camel-k.git from cd5d26652 Periodic Sync of Camel K Main Branch for SBOM Generation new 4cdef9d25 chore: changelog automatic update new f1a66758f Periodic Sync of Camel K Main Branch for SBOM Generation 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: CHANGELOG.md | 7 ++ camel-k-sbom/camel-k-sbom.json | 54 +- 2 files changed, 34 insertions(+), 27 deletions(-)
[camel-k] 02/02: Periodic Sync of Camel K Main Branch for SBOM Generation
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch release-1.12.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit f1a66758f62857435b1c113095af716ba77ba169
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Jun 27 23:45:39 2023 +
Periodic Sync of Camel K Main Branch for SBOM Generation
---
camel-k-sbom/camel-k-sbom.json | 54 +-
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index 8fc521a18..751350971 100644
--- a/camel-k-sbom/camel-k-sbom.json
+++ b/camel-k-sbom/camel-k-sbom.json
@@ -2,10 +2,10 @@
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json";,
"bomFormat": "CycloneDX",
"specVersion": "1.4",
- "serialNumber": "urn:uuid:7bc3a6f9-7a83-447c-a702-b53354ad8a20",
+ "serialNumber": "urn:uuid:84f3c0e6-162f-44be-a226-b4db68a1e3ac",
"version": 1,
"metadata": {
-"timestamp": "2023-06-26T23:48:56Z",
+"timestamp": "2023-06-27T23:45:39Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref":
"pkg:golang/github.com/apache/camel-k@v0.0.0-20230626234225-f1e7a4c53329?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k@v0.0.0-20230627233959-4cdef9d25133?type=module",
"type": "application",
"name": "github.com/apache/camel-k",
- "version": "v0.0.0-20230626234225-f1e7a4c53329",
- "purl":
"pkg:golang/github.com/apache/camel-k@v0.0.0-20230626234225-f1e7a4c53329?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20230627233959-4cdef9d25133",
+ "purl":
"pkg:golang/github.com/apache/camel-k@v0.0.0-20230627233959-4cdef9d25133?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k";,
@@ -510,18 +510,18 @@
}
},
{
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230626234225-f1e7a4c53329?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230627233959-4cdef9d25133?type=module",
"type": "library",
"name": "github.com/apache/camel-k/pkg/apis/camel",
- "version": "v0.0.0-20230626234225-f1e7a4c53329",
+ "version": "v0.0.0-20230627233959-4cdef9d25133",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content":
"528cea118dd541bbdcb97dad216b92e5020b1669bdee63a9551d3b25c80a6693"
+ "content":
"e4887a5c5bc2182db0501f8bbcaef1bc5d8f8947e9edd712902630aa06ca99ce"
}
],
- "purl":
"pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230626234225-f1e7a4c53329?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl":
"pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230627233959-4cdef9d25133?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k/pkg/apis/camel";,
@@ -530,18 +530,18 @@
]
},
{
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230626234225-f1e7a4c53329?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230627233959-4cdef9d25133?type=module",
"type": "library",
"name": "github.com/apache/camel-k/pkg/client/camel",
- "version": "v0.0.0-20230626234225-f1e7a4c53329",
+ "version": "v0.0.0-20230627233959-4cdef9d25133",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content":
"6e5c7d08125357ba4671fee678e88f82cf7aab7da87aa8ffa1430f2a65b3e0ec"
+ "content":
"08af67c6fbf16223714565fd01c2cd0c9c28a8e5655d7a9cb67e4aad01c097ed"
}
],
- "purl":
"pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230626234225-f1e7a4c53329?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl":
"pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230627233959-4cdef9d25133?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k/pkg/client/camel";,
@@ -550,18 +550,18 @@
]
},
{
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/kamelet/repository@v0.0.0-20230626234225-f1e7a4c53329?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/kamelet/repository@v0.0.0-20230627233959-4cdef9d25133?type=module",
"type": "library",
"name": "github.com/apache/camel-k/pkg/kamelet/repository",
- "version": "v0.0.0-20230626234225-f1e7a4c53329",
+ "version": "v0.0.0-20230627233959-4cdef9d25133",
"scope": "required",
"hashes": [
{
"alg": "SH
[camel-k] 01/02: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-1.12.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 4cdef9d2513331d55322047e7af5991b6df04b00 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Jun 27 23:39:59 2023 + chore: changelog automatic update --- CHANGELOG.md | 7 +++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a2681a18d..51bc03583 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,15 +6,22 @@ **Closed issues:** +- Allow to remote debug the Operator [\#4513](https://github.com/apache/camel-k/issues/4513) - Updating a property will cause Integration to rebuild [\#4511](https://github.com/apache/camel-k/issues/4511) +- CamelCatalog generated twice [\#4504](https://github.com/apache/camel-k/issues/4504) - Question: use camel dependency version 3.20.3 or higher [\#4502](https://github.com/apache/camel-k/issues/4502) - Problems reading boolean values for traits using comments [\#4493](https://github.com/apache/camel-k/issues/4493) - Alter namespace where the Push of Operator sends the image generated [\#4492](https://github.com/apache/camel-k/issues/4492) - Empty build strategy [\#4485](https://github.com/apache/camel-k/issues/4485) - pod-template with knative in rest integration [\#4484](https://github.com/apache/camel-k/issues/4484) +- Missing license header [\#4469](https://github.com/apache/camel-k/issues/4469) +- Rework CLIs required by operator build process [\#4466](https://github.com/apache/camel-k/issues/4466) +- Horizontal scaling ability for operators [\#4173](https://github.com/apache/camel-k/issues/4173) +- Observability documentation - Update to micrometer extension [\#4157](https://github.com/apache/camel-k/issues/4157) - Helm Node Selector [\#4096](https://github.com/apache/camel-k/issues/4096) - Update the version of the kind-action [\#4063](https://github.com/apache/camel-k/issues/4063) - Onboard Camel K Tekton tasks [\#3795](https://github.com/apache/camel-k/issues/3795) +- Document supported components [\#2228](https://github.com/apache/camel-k/issues/2228) ## [1.12.2-nightly](https://github.com/apache/camel-k/tree/1.12.2-nightly) (2023-06-13)
[GitHub] [camel] ppalaga commented on pull request #10487: Manage single version of Guava or avoid it where possible
ppalaga commented on PR #10487: URL: https://github.com/apache/camel/pull/10487#issuecomment-1610217345 I studied those logs thoroughly seeking for some hint which of the ignite and other modules' tests is failing on the CI but I have not found anything. Could please somebody share the secret sauce for deciphering those logs? > I wonder if you get error in camel-ignite also locally ? No, it is passing for me locally ignite, as well as with some other modules which have failures reported on the CI. Can it be that the CI reports are somehow broken? -- 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] ppalaga commented on a diff in pull request #10441: init outputTimestamp
ppalaga commented on code in PR #10441:
URL: https://github.com/apache/camel/pull/10441#discussion_r1244343583
##
pom.xml:
##
@@ -117,7 +117,7 @@
${jdk.version}
-1
+
1687211006
Review Comment:
@hboutemy thanks for coming around! I was struggling a bit with
project.build.outputTimestamp last week, because some zip creating plugin
(perhaps jar plugin) was complaining about a negative timestamp. That's why I
changed it to the current value `1980-01-01T00:00:02Z` and that's why the
current PR has conflicts.
Was the negative timestamp maybe also the reason why you have sent this PR?
> Can you point to more details on this practice?
I think https://maven.apache.org/guides/mini/guide-reproducible-builds.html
is a nice quick resource about the topic of reproducible builds. (I guess it
was written by you @hboutemy?) The part relevant for us is
> Q. Can the project.build.outputTimestamp property in pom.xml be updated
automatically at release time?
> A. Yes.
>
> Details depend on your release process tooling:
>
> if you use
[maven-release-plugin](https://maven.apache.org/plugins/maven-release-plugin/),
you'll need version 3.0.0-M1 or later: it will automatically update the
timestamp value in pom.xml during the release in the same commit that updates
version,
We happen to use an ancient version 2.4.2, there is a comment referring to
https://issues.apache.org/jira/browse/MRELEASE-812 which is fixed since 9+
years, so we could perhaps upgrade, @gzurowski?
--
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] ppalaga commented on pull request #10441: init outputTimestamp
ppalaga commented on PR #10441: URL: https://github.com/apache/camel/pull/10441#issuecomment-1610201980 > @ppalaga any feedback on this PR ? Thanks for the headsup, I commented inline. -- 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] ppalaga commented on a diff in pull request #10441: init outputTimestamp
ppalaga commented on code in PR #10441:
URL: https://github.com/apache/camel/pull/10441#discussion_r1244343583
##
pom.xml:
##
@@ -117,7 +117,7 @@
${jdk.version}
-1
+
1687211006
Review Comment:
@hboutemy thanks for coming around! I was struggling a bit with
project.build.outputTimestamp last week, because some zip creating plugin
(perhaps jar plugin) was complaining about a negative timestamp. That's why I
changed it to the current value `1980-01-01T00:00:02Z` and that's why the
current PR has conflicts.
Was that maybe also the reason why you have sent this PR?
> Can you point to more details on this practice?
I think https://maven.apache.org/guides/mini/guide-reproducible-builds.html
is a nice quick resource about the topic of reproducible builds. (I guess it
was written by you @hboutemy?) The part relevant for us is
> Q. Can the project.build.outputTimestamp property in pom.xml be updated
automatically at release time?
> A. Yes.
>
> Details depend on your release process tooling:
>
> if you use
[maven-release-plugin](https://maven.apache.org/plugins/maven-release-plugin/),
you'll need version 3.0.0-M1 or later: it will automatically update the
timestamp value in pom.xml during the release in the same commit that updates
version,
We happen to use an ancient version 2.4.2, there is a comment referring to
https://issues.apache.org/jira/browse/MRELEASE-812 which is fixed since 9+
years, so we could perhaps upgrade, @gzurowski?
--
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] annotated tag camel-4.0.0-RC1 created (now 9f5f78ed7c3)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to annotated tag camel-4.0.0-RC1 in repository https://gitbox.apache.org/repos/asf/camel.git at 9f5f78ed7c3 (tag) tagging bd4748d37ec86f2df0ee7a7dbf6cdac2ba6e161d (commit) replaces camel-4.0.0-M3 by Gregor Zurowski on Tue Jun 27 20:19:13 2023 + - Log - [maven-release-plugin] copy for tag camel-4.0.0-RC1 --- No new revisions were added by this update.
[camel] branch regen_bot_3x updated (0d51aec9266 -> 2ddb366db85)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3x in repository https://gitbox.apache.org/repos/asf/camel.git from 0d51aec9266 [CAMEL-19479] Add `threadId` to simple language (#10475) add 2ddb366db85 CAMEL-19502 Netty4-http SNI configuration using SSLContextParameters (#10516) No new revisions were added by this update. Summary of changes: .../netty/http/HttpClientInitializerFactory.java | 9 +- .../component/netty/http/NettyHttpSSLSNITest.java | 135 + 2 files changed, 143 insertions(+), 1 deletion(-) create mode 100644 components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLSNITest.java
[camel] branch regen_bot_3x updated (feff82f8c47 -> 0d51aec9266)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3x in repository https://gitbox.apache.org/repos/asf/camel.git from feff82f8c47 Add possibility to override LRAClient (#10505) add 0d51aec9266 [CAMEL-19479] Add `threadId` to simple language (#10475) No new revisions were added by this update. Summary of changes: .../language/csimple/joor/OriginalSimpleTest.java | 7 +++ .../docs/modules/languages/pages/simple-language.adoc | 3 +++ .../apache/camel/language/csimple/CSimpleHelper.java | 4 .../language/simple/ast/SimpleFunctionExpression.java | 4 .../org/apache/camel/language/simple/SimpleTest.java | 9 - .../camel/support/builder/ExpressionBuilder.java | 18 ++ tooling/maven/camel-package-maven-plugin/pom.xml | 2 +- 7 files changed, 45 insertions(+), 2 deletions(-)
[GitHub] [camel] github-actions[bot] closed pull request #10522: Generated sources regen
github-actions[bot] closed pull request #10522: Generated sources regen URL: https://github.com/apache/camel/pull/10522 -- 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 (267ad6e5569 -> 2e5733611fb)
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 267ad6e5569 Regen for commit cc6c092a976a75130414738eff24e44335c997f7 add 2e5733611fb 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 (267ad6e5569) \ N -- N -- N refs/heads/regen_bot (2e5733611fb) 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 regen_bot_3x updated (e6e8d12737f -> feff82f8c47)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3x in repository https://gitbox.apache.org/repos/asf/camel.git from e6e8d12737f CAMEL-19509: camel-yaml-dsl - Add support for kamelet binding with no sink add feff82f8c47 Add possibility to override LRAClient (#10505) No new revisions were added by this update. Summary of changes: .../org/apache/camel/service/lra/LRAClient.java| 37 ++- .../apache/camel/service/lra/LRASagaService.java | 12 +++- .../apache/camel/service/lra/LRAClientTest.java| 66 +++ .../camel/service/lra/LRASagaServiceTest.java | 75 ++ 4 files changed, 174 insertions(+), 16 deletions(-) create mode 100644 components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAClientTest.java create mode 100644 components/camel-lra/src/test/java/org/apache/camel/service/lra/LRASagaServiceTest.java
[camel] branch regen_bot updated (e689d6fb428 -> 267ad6e5569)
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 e689d6fb428 Reformat add b474dcf1946 [CAMEL-19479] Add `threadId` to simple language (#10475) add cc6c092a976 CAMEL-19502 Netty4-http SNI configuration using SSLContextParameters (#10516) add 267ad6e5569 Regen for commit cc6c092a976a75130414738eff24e44335c997f7 No new revisions were added by this update. Summary of changes: .../language/csimple/joor/OriginalSimpleTest.java | 7 ++ .../netty/http/HttpClientInitializerFactory.java | 9 +- .../component/netty/http/NettyHttpSSLSNITest.java | 135 + .../modules/languages/pages/simple-language.adoc | 3 + .../camel/language/csimple/CSimpleHelper.java | 4 + .../simple/ast/SimpleFunctionExpression.java | 4 + .../apache/camel/language/simple/SimpleTest.java | 9 +- .../camel/support/builder/ExpressionBuilder.java | 18 +++ tooling/maven/camel-package-maven-plugin/pom.xml | 2 +- 9 files changed, 188 insertions(+), 3 deletions(-) create mode 100644 components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLSNITest.java
[GitHub] [camel] github-actions[bot] opened a new pull request, #10522: Generated sources regen
github-actions[bot] opened a new pull request, #10522: URL: https://github.com/apache/camel/pull/10522 Regen bot :robot: found some uncommitted changes after running build on :camel: `main` branch. 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] davsclaus commented on a diff in pull request #10441: init outputTimestamp
davsclaus commented on code in PR #10441:
URL: https://github.com/apache/camel/pull/10441#discussion_r1244213562
##
pom.xml:
##
@@ -117,7 +117,7 @@
${jdk.version}
-1
+
1687211006
Review Comment:
Can you point to more details on this practice? Do other open source
projects do this or where can we find more about 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] davsclaus commented on pull request #10487: Manage single version of Guava or avoid it where possible
davsclaus commented on PR #10487: URL: https://github.com/apache/camel/pull/10487#issuecomment-1610055246 I wonder if you get error in camel-ignite also locally ? -- 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 commented on pull request #10487: Manage single version of Guava or avoid it where possible
davsclaus commented on PR #10487: URL: https://github.com/apache/camel/pull/10487#issuecomment-1610054983 Testing component 6 of 17: components/camel-ignite Logging test to /home/runner/work/camel/camel/automated-build-log/components-camel-ignite.log Failed components/camel-ignite test: 6 verified / 1 failed Copying test log file at target/camel-ignite-test.log to the log directory -- 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: 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.git The following commit(s) were added to refs/heads/main by this push: new 2e5733611fb Regen 2e5733611fb is described below commit 2e5733611fb1ab6e9caeb1f7cc4bb5afccac692e Author: Claus Ibsen AuthorDate: Tue Jun 27 20:55:33 2023 +0200 Regen --- .../resources/org/apache/camel/catalog/schemas/camel-spring.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2bf707a8ddb..649a953edab 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 @@ -439,7 +439,7 @@ Enriches a message with data from a secondary resource
[camel] branch camel-3.x updated: CAMEL-19502 Netty4-http SNI configuration using SSLContextParameters (#10516)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.x by this push:
new 2ddb366db85 CAMEL-19502 Netty4-http SNI configuration using
SSLContextParameters (#10516)
2ddb366db85 is described below
commit 2ddb366db85562aaad9ecdce158b51ecb7934ca3
Author: Michael Hughes
AuthorDate: Tue Jun 27 19:51:57 2023 +0100
CAMEL-19502 Netty4-http SNI configuration using SSLContextParameters
(#10516)
* CAMEL-19502 Netty4-http SNI configuration using SSLContextParameters
* CAMEL-19502 fix build by committing changed file
---
.../netty/http/HttpClientInitializerFactory.java | 9 +-
.../component/netty/http/NettyHttpSSLSNITest.java | 135 +
2 files changed, 143 insertions(+), 1 deletion(-)
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpClientInitializerFactory.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpClientInitializerFactory.java
index 7ee0bc61211..2a0bc816f49 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpClientInitializerFactory.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpClientInitializerFactory.java
@@ -22,6 +22,7 @@ import java.util.List;
import java.util.concurrent.TimeUnit;
import javax.net.ssl.SNIHostName;
+import javax.net.ssl.SNIServerName;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLParameters;
@@ -54,6 +55,7 @@ public class HttpClientInitializerFactory extends
ClientInitializerFactory {
protected NettyHttpConfiguration configuration;
private NettyHttpProducer producer;
private SSLContext sslContext;
+private List sniServerNames;
public HttpClientInitializerFactory() {
// default constructor needed
@@ -143,6 +145,10 @@ public class HttpClientInitializerFactory extends
ClientInitializerFactory {
// create ssl context once
if (configuration.getSslContextParameters() != null) {
answer =
configuration.getSslContextParameters().createSSLContext(producer.getContext());
+if (answer.getSupportedSSLParameters().getServerNames() != null
+&&
!answer.getSupportedSSLParameters().getServerNames().isEmpty()) {
+sniServerNames =
answer.getSupportedSSLParameters().getServerNames();
+}
} else {
if (configuration.getKeyStoreFile() == null &&
configuration.getKeyStoreResource() == null) {
LOG.debug("keystorefile is null");
@@ -192,7 +198,8 @@ public class HttpClientInitializerFactory extends
ClientInitializerFactory {
SSLEngine engine = sslContext.createSSLEngine(uri.getHost(),
uri.getPort());
engine.setUseClientMode(true);
SSLParameters sslParameters = engine.getSSLParameters();
-sslParameters.setServerNames(Arrays.asList(new
SNIHostName(uri.getHost(;
+sslParameters
+.setServerNames(sniServerNames != null ? sniServerNames :
Arrays.asList(new SNIHostName(uri.getHost(;
engine.setSSLParameters(sslParameters);
if (producer.getConfiguration().getSslContextParameters() == null)
{
// just set the enabledProtocols if the SslContextParameter
doesn't set
diff --git
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLSNITest.java
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLSNITest.java
new file mode 100644
index 000..6a473bb317f
--- /dev/null
+++
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLSNITest.java
@@ -0,0 +1,135 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.netty.http;
+
+import java.util.List;
+
+import javax.net.ssl.ExtendedSSLSession;
+import javax.net.ssl.SNIHostName;
+import javax.net.ssl.SNISer
[camel] branch regen_bot updated (238ec905e46 -> e689d6fb428)
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 238ec905e46 Add possibility to override LRAClient (#10505) add e689d6fb428 Reformat No new revisions were added by this update. Summary of changes: .../src/test/resources/kamelets/log-action.kamelet.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
[GitHub] [camel] davsclaus commented on pull request #10516: CAMEL-19502 Netty4-http SNI configuration using SSLContextParameters
davsclaus commented on PR #10516: URL: https://github.com/apache/camel/pull/10516#issuecomment-1610050555 Next time then avoid including the unrelated change in camel-spring -- 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-19502 Netty4-http SNI configuration using SSLContextParameters (#10516)
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 cc6c092a976 CAMEL-19502 Netty4-http SNI configuration using
SSLContextParameters (#10516)
cc6c092a976 is described below
commit cc6c092a976a75130414738eff24e44335c997f7
Author: Michael Hughes
AuthorDate: Tue Jun 27 19:51:57 2023 +0100
CAMEL-19502 Netty4-http SNI configuration using SSLContextParameters
(#10516)
* CAMEL-19502 Netty4-http SNI configuration using SSLContextParameters
* CAMEL-19502 fix build by committing changed file
---
.../apache/camel/catalog/schemas/camel-spring.xsd | 2 +-
.../netty/http/HttpClientInitializerFactory.java | 9 +-
.../component/netty/http/NettyHttpSSLSNITest.java | 135 +
3 files changed, 144 insertions(+), 2 deletions(-)
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 649a953edab..2bf707a8ddb 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
@@ -439,7 +439,7 @@ Enriches a message with data from a secondary resource
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpClientInitializerFactory.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpClientInitializerFactory.java
index 7ee0bc61211..2a0bc816f49 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpClientInitializerFactory.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpClientInitializerFactory.java
@@ -22,6 +22,7 @@ import java.util.List;
import java.util.concurrent.TimeUnit;
import javax.net.ssl.SNIHostName;
+import javax.net.ssl.SNIServerName;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLParameters;
@@ -54,6 +55,7 @@ public class HttpClientInitializerFactory extends
ClientInitializerFactory {
protected NettyHttpConfiguration configuration;
private NettyHttpProducer producer;
private SSLContext sslContext;
+private List sniServerNames;
public HttpClientInitializerFactory() {
// default constructor needed
@@ -143,6 +145,10 @@ public class HttpClientInitializerFactory extends
ClientInitializerFactory {
// create ssl context once
if (configuration.getSslContextParameters() != null) {
answer =
configuration.getSslContextParameters().createSSLContext(producer.getContext());
+if (answer.getSupportedSSLParameters().getServerNames() != null
+&&
!answer.getSupportedSSLParameters().getServerNames().isEmpty()) {
+sniServerNames =
answer.getSupportedSSLParameters().getServerNames();
+}
} else {
if (configuration.getKeyStoreFile() == null &&
configuration.getKeyStoreResource() == null) {
LOG.debug("keystorefile is null");
@@ -192,7 +198,8 @@ public class HttpClientInitializerFactory extends
ClientInitializerFactory {
SSLEngine engine = sslContext.createSSLEngine(uri.getHost(),
uri.getPort());
engine.setUseClientMode(true);
SSLParameters sslParameters = engine.getSSLParameters();
-sslParameters.setServerNames(Arrays.asList(new
SNIHostName(uri.getHost(;
+sslParameters
+.setServerNames(sniServerNames != null ? sniServerNames :
Arrays.asList(new SNIHostName(uri.getHost(;
engine.setSSLParameters(sslParameters);
if (producer.getConfiguration().getSslContextParameters() == null)
{
// just set the enabledProtocols if the SslContextParameter
doesn't set
diff --git
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLSNITest.java
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLSNITest.java
new file mode 100644
index 000..6a473bb317f
--- /dev/null
+++
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLSNITest.java
@@ -0,0 +1,135 @@
+/*
+ * 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. Y
[GitHub] [camel] davsclaus merged pull request #10516: CAMEL-19502 Netty4-http SNI configuration using SSLContextParameters
davsclaus merged PR #10516: URL: https://github.com/apache/camel/pull/10516 -- 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.x updated: [CAMEL-19479] Add `threadId` to simple language (#10475)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.x by this push:
new 0d51aec9266 [CAMEL-19479] Add `threadId` to simple language (#10475)
0d51aec9266 is described below
commit 0d51aec9266861f6cfa5c838add22f32dc1bff7d
Author: Adriano Machado <60320+ammach...@users.noreply.github.com>
AuthorDate: Tue Jun 27 14:43:08 2023 -0400
[CAMEL-19479] Add `threadId` to simple language (#10475)
* [CAMEL-19479] Add `threadId` to simple language
* [CAMEL-19479] Adding documentation
* [CAMEL-19479] Code formatting
-
Co-authored-by: Adriano Machado
---
.../language/csimple/joor/OriginalSimpleTest.java | 7 +++
.../docs/modules/languages/pages/simple-language.adoc | 3 +++
.../apache/camel/language/csimple/CSimpleHelper.java | 4
.../language/simple/ast/SimpleFunctionExpression.java | 4
.../org/apache/camel/language/simple/SimpleTest.java | 9 -
.../camel/support/builder/ExpressionBuilder.java | 18 ++
tooling/maven/camel-package-maven-plugin/pom.xml | 2 +-
7 files changed, 45 insertions(+), 2 deletions(-)
diff --git
a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
index 501b370ef61..f6f2ce31917 100644
---
a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
+++
b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
@@ -239,6 +239,13 @@ public class OriginalSimpleTest extends
LanguageTestSupport {
assertExpression("\n${in.body}\r".trim(), "world!");
}
+@Test
+public void testSimpleThreadId() {
+long id = Thread.currentThread().getId();
+assertExpression("${threadId}", id);
+assertExpression("The id is ${threadId}", "The id is " + id);
+}
+
@Test
public void testSimpleThreadName() {
String name = Thread.currentThread().getName();
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
index 4fa63aaded8..ddc313a6a88 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
@@ -183,6 +183,9 @@ Exchange is being routed.
|stepId |String |Returns the id of the current step the
Exchange is being routed.
+|threadId |String |Returns the id of the current thread. Can be used for
+logging purpose.
+
|threadName |String |Returns the name of the current thread. Can be used for
logging purpose.
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
index 1954cc00d75..6113b27c2ab 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
@@ -224,6 +224,10 @@ public final class CSimpleHelper {
return Thread.currentThread().getName();
}
+public static long threadId() {
+return Thread.currentThread().getId();
+}
+
public static String hostName() {
return InetAddressUtil.getLocalHostNameSafe();
}
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
index cc5052b517f..3046380f6e0 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
@@ -445,6 +445,8 @@ public class SimpleFunctionExpression extends
LiteralExpression {
return ExpressionBuilder.exchangeExceptionMessageExpression();
} else if (ObjectHelper.equal(expression, "exception.stacktrace")) {
return ExpressionBuilder.exchangeExceptionStackTraceExpression();
+} else if (ObjectHelper.equal(expression, "threadId")) {
+return ExpressionBuilder.threadIdExpression();
} else if (ObjectHelper.equal(expression, "threadName")) {
return ExpressionBuilder.threadNameExpression();
} else if (ObjectHelper.equal(expression, "hostname")) {
@@ -826,6 +828,8 @@ public class SimpleFunctionExpression
[camel] branch main updated: [CAMEL-19479] Add `threadId` to simple language (#10475)
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 b474dcf1946 [CAMEL-19479] Add `threadId` to simple language (#10475)
b474dcf1946 is described below
commit b474dcf19469113647c3d126e31701d2c394df1e
Author: Adriano Machado <60320+ammach...@users.noreply.github.com>
AuthorDate: Tue Jun 27 14:43:08 2023 -0400
[CAMEL-19479] Add `threadId` to simple language (#10475)
* [CAMEL-19479] Add `threadId` to simple language
* [CAMEL-19479] Adding documentation
* [CAMEL-19479] Code formatting
-
Co-authored-by: Adriano Machado
---
.../language/csimple/joor/OriginalSimpleTest.java | 7 +++
.../docs/modules/languages/pages/simple-language.adoc | 3 +++
.../apache/camel/language/csimple/CSimpleHelper.java | 4
.../language/simple/ast/SimpleFunctionExpression.java | 4
.../org/apache/camel/language/simple/SimpleTest.java | 9 -
.../camel/support/builder/ExpressionBuilder.java | 18 ++
tooling/maven/camel-package-maven-plugin/pom.xml | 2 +-
7 files changed, 45 insertions(+), 2 deletions(-)
diff --git
a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
index deac6f39f7b..570e50e97a3 100644
---
a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
+++
b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
@@ -245,6 +245,13 @@ public class OriginalSimpleTest extends
LanguageTestSupport {
assertExpression("\n${in.body}\r".trim(), "world!");
}
+@Test
+public void testSimpleThreadId() {
+long id = Thread.currentThread().getId();
+assertExpression("${threadId}", id);
+assertExpression("The id is ${threadId}", "The id is " + id);
+}
+
@Test
public void testSimpleThreadName() {
String name = Thread.currentThread().getName();
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
index 82760ae0e2d..c24d453eec4 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
@@ -186,6 +186,9 @@ Exchange is being routed.
|stepId |String |Returns the id of the current step the
Exchange is being routed.
+|threadId |String |Returns the id of the current thread. Can be used for
+logging purpose.
+
|threadName |String |Returns the name of the current thread. Can be used for
logging purpose.
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
index 983f96cfe76..a37a7fac7d4 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
@@ -216,6 +216,10 @@ public final class CSimpleHelper {
return Thread.currentThread().getName();
}
+public static long threadId() {
+return Thread.currentThread().getId();
+}
+
public static String hostName() {
return InetAddressUtil.getLocalHostNameSafe();
}
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
index 7dbd1b891ff..4f2f27d8552 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
@@ -439,6 +439,8 @@ public class SimpleFunctionExpression extends
LiteralExpression {
return ExpressionBuilder.exchangeExceptionMessageExpression();
} else if (ObjectHelper.equal(expression, "exception.stacktrace")) {
return ExpressionBuilder.exchangeExceptionStackTraceExpression();
+} else if (ObjectHelper.equal(expression, "threadId")) {
+return ExpressionBuilder.threadIdExpression();
} else if (ObjectHelper.equal(expression, "threadName")) {
return ExpressionBuilder.threadNameExpression();
} else if (ObjectHelper.equal(expression, "hostname")) {
@@ -846,6 +848,8 @@ public class SimpleFunctionExpression extends
[camel] branch main updated: Reformat
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 e689d6fb428 Reformat e689d6fb428 is described below commit e689d6fb428b893d484e619ec8b0853a71351551 Author: Claus Ibsen AuthorDate: Tue Jun 27 20:42:47 2023 +0200 Reformat --- .../src/test/resources/kamelets/log-action.kamelet.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/log-action.kamelet.yaml b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/log-action.kamelet.yaml index 7f4f7ef73fe..0107a2d6977 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/log-action.kamelet.yaml +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/log-action.kamelet.yaml @@ -1,4 +1,4 @@ -# --- +# # 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. @@ -13,7 +13,8 @@ # 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. -# --- +# + apiVersion: camel.apache.org/v1alpha1 kind: Kamelet metadata:
[GitHub] [camel] davsclaus merged pull request #10475: [CAMEL-19479] Add `threadId` to simple language
davsclaus merged PR #10475: URL: https://github.com/apache/camel/pull/10475 -- 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 #10475: [CAMEL-19479] Add `threadId` to simple language
github-actions[bot] commented on PR #10475: URL: https://github.com/apache/camel/pull/10475#issuecomment-1610032278 ### Core test results: | Tested | Failed :x: | Passed :white_check_mark: | | --- | --- | --- | | 1 | 1 | 0 | -- 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 #10475: [CAMEL-19479] Add `threadId` to simple language
github-actions[bot] commented on PR #10475: URL: https://github.com/apache/camel/pull/10475#issuecomment-1610032260 ### Components test results: | Total | Tested | Failed :x: | Passed :white_check_mark: | | --- | --- | --- | --- | | 1 | 1 | 0 | 1 | -- 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 (dfbaf4abee6 -> 238ec905e46)
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 dfbaf4abee6 Camel-Salesforce: s390x support add 238ec905e46 Add possibility to override LRAClient (#10505) No new revisions were added by this update. Summary of changes: .../org/apache/camel/service/lra/LRAClient.java| 37 ++- .../apache/camel/service/lra/LRASagaService.java | 12 +++- .../apache/camel/service/lra/LRAClientTest.java| 66 +++ .../camel/service/lra/LRASagaServiceTest.java | 75 ++ 4 files changed, 174 insertions(+), 16 deletions(-) create mode 100644 components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAClientTest.java create mode 100644 components/camel-lra/src/test/java/org/apache/camel/service/lra/LRASagaServiceTest.java
[GitHub] [camel] davsclaus commented on pull request #10505: Add possibility to override LRAClient
davsclaus commented on PR #10505: URL: https://github.com/apache/camel/pull/10505#issuecomment-1610001153 No its fine we could cherry pick this cleanly to main branch -- 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: Add possibility to override LRAClient (#10505)
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 238ec905e46 Add possibility to override LRAClient (#10505)
238ec905e46 is described below
commit 238ec905e46b7e0a737925e73569f841556845dd
Author: Johannes Boßle
AuthorDate: Tue Jun 27 20:12:32 2023 +0200
Add possibility to override LRAClient (#10505)
* Add possibility to override LRAClient
* [CAMEL-19508] add a common prepareRequest method
* [CAMEL-19508] ensure default headers remain as is
-
Co-authored-by: Johannes Boßle
---
.../org/apache/camel/service/lra/LRAClient.java| 37 ++-
.../apache/camel/service/lra/LRASagaService.java | 12 +++-
.../apache/camel/service/lra/LRAClientTest.java| 66 +++
.../camel/service/lra/LRASagaServiceTest.java | 75 ++
4 files changed, 174 insertions(+), 16 deletions(-)
diff --git
a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAClient.java
b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAClient.java
index 0c91d514a3b..77833c16264 100644
---
a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAClient.java
+++
b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAClient.java
@@ -47,9 +47,16 @@ public class LRAClient implements Closeable {
private final String lraUrl;
public LRAClient(LRASagaService sagaService) {
-this.sagaService = sagaService;
+this(sagaService, HttpClient.newHttpClient());
+}
-client = HttpClient.newHttpClient();
+public LRAClient(LRASagaService sagaService, HttpClient client) {
+if (client == null) {
+throw new IllegalArgumentException("HttpClient must not be null");
+}
+
+this.sagaService = sagaService;
+this.client = client;
lraUrl = new LRAUrlBuilder()
.host(sagaService.getCoordinatorUrl())
@@ -58,8 +65,7 @@ public class LRAClient implements Closeable {
}
public CompletableFuture newLRA() {
-HttpRequest request = HttpRequest.newBuilder()
-.uri(URI.create(lraUrl + COORDINATOR_PATH_START))
+HttpRequest request = prepareRequest(URI.create(lraUrl +
COORDINATOR_PATH_START))
.POST(HttpRequest.BodyPublishers.ofString(""))
.build();
@@ -109,11 +115,10 @@ public class LRAClient implements Closeable {
if (step.getTimeoutInMilliseconds().isPresent()) {
lraEndpoint = lraEndpoint + "?" + HEADER_TIME_LIMIT + "=" +
step.getTimeoutInMilliseconds().get();
}
-HttpRequest request = HttpRequest.newBuilder()
-.uri(URI.create(lraEndpoint))
-.header(HEADER_LINK, link.toString())
-.header(Exchange.SAGA_LONG_RUNNING_ACTION, lra.toString())
-.header("Content-Type", "text/plain")
+HttpRequest request = prepareRequest(URI.create(lraEndpoint))
+.setHeader(HEADER_LINK, link.toString())
+.setHeader(Exchange.SAGA_LONG_RUNNING_ACTION,
lra.toString())
+.setHeader("Content-Type", "text/plain")
.PUT(HttpRequest.BodyPublishers.ofString(link.toString()))
.build();
@@ -130,9 +135,8 @@ public class LRAClient implements Closeable {
}
public CompletableFuture complete(URL lra) {
-HttpRequest request = HttpRequest.newBuilder()
-.uri(URI.create(lra.toString() + COORDINATOR_PATH_CLOSE))
-.header("Content-Type", "text/plain")
+HttpRequest request = prepareRequest(URI.create(lra.toString() +
COORDINATOR_PATH_CLOSE))
+.setHeader("Content-Type", "text/plain")
.PUT(HttpRequest.BodyPublishers.ofString(""))
.build();
@@ -148,9 +152,8 @@ public class LRAClient implements Closeable {
}
public CompletableFuture compensate(URL lra) {
-HttpRequest request = HttpRequest.newBuilder()
-.uri(URI.create(lra.toString() + COORDINATOR_PATH_CANCEL))
-.header("Content-Type", "text/plain")
+HttpRequest request = prepareRequest(URI.create(lra.toString() +
COORDINATOR_PATH_CANCEL))
+.setHeader("Content-Type", "text/plain")
.PUT(HttpRequest.BodyPublishers.ofString(""))
.build();
@@ -165,6 +168,10 @@ public class LRAClient implements Closeable {
});
}
+protected HttpRequest.Builder prepareRequest(URI uri) {
+return HttpRequest.newBuilder().uri(uri);
+}
+
private URL toURL(Object url) {
if (url == null) {
return null;
diff --git
a/components/camel-lra/src/main/
[camel] branch camel-3.x updated: Add possibility to override LRAClient (#10505)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.x by this push:
new feff82f8c47 Add possibility to override LRAClient (#10505)
feff82f8c47 is described below
commit feff82f8c47ee032a1cca1f661295b85bfd205cf
Author: Johannes Boßle
AuthorDate: Tue Jun 27 20:12:32 2023 +0200
Add possibility to override LRAClient (#10505)
* Add possibility to override LRAClient
* [CAMEL-19508] add a common prepareRequest method
* [CAMEL-19508] ensure default headers remain as is
-
Co-authored-by: Johannes Boßle
---
.../org/apache/camel/service/lra/LRAClient.java| 37 ++-
.../apache/camel/service/lra/LRASagaService.java | 12 +++-
.../apache/camel/service/lra/LRAClientTest.java| 66 +++
.../camel/service/lra/LRASagaServiceTest.java | 75 ++
4 files changed, 174 insertions(+), 16 deletions(-)
diff --git
a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAClient.java
b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAClient.java
index 0c91d514a3b..77833c16264 100644
---
a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAClient.java
+++
b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAClient.java
@@ -47,9 +47,16 @@ public class LRAClient implements Closeable {
private final String lraUrl;
public LRAClient(LRASagaService sagaService) {
-this.sagaService = sagaService;
+this(sagaService, HttpClient.newHttpClient());
+}
-client = HttpClient.newHttpClient();
+public LRAClient(LRASagaService sagaService, HttpClient client) {
+if (client == null) {
+throw new IllegalArgumentException("HttpClient must not be null");
+}
+
+this.sagaService = sagaService;
+this.client = client;
lraUrl = new LRAUrlBuilder()
.host(sagaService.getCoordinatorUrl())
@@ -58,8 +65,7 @@ public class LRAClient implements Closeable {
}
public CompletableFuture newLRA() {
-HttpRequest request = HttpRequest.newBuilder()
-.uri(URI.create(lraUrl + COORDINATOR_PATH_START))
+HttpRequest request = prepareRequest(URI.create(lraUrl +
COORDINATOR_PATH_START))
.POST(HttpRequest.BodyPublishers.ofString(""))
.build();
@@ -109,11 +115,10 @@ public class LRAClient implements Closeable {
if (step.getTimeoutInMilliseconds().isPresent()) {
lraEndpoint = lraEndpoint + "?" + HEADER_TIME_LIMIT + "=" +
step.getTimeoutInMilliseconds().get();
}
-HttpRequest request = HttpRequest.newBuilder()
-.uri(URI.create(lraEndpoint))
-.header(HEADER_LINK, link.toString())
-.header(Exchange.SAGA_LONG_RUNNING_ACTION, lra.toString())
-.header("Content-Type", "text/plain")
+HttpRequest request = prepareRequest(URI.create(lraEndpoint))
+.setHeader(HEADER_LINK, link.toString())
+.setHeader(Exchange.SAGA_LONG_RUNNING_ACTION,
lra.toString())
+.setHeader("Content-Type", "text/plain")
.PUT(HttpRequest.BodyPublishers.ofString(link.toString()))
.build();
@@ -130,9 +135,8 @@ public class LRAClient implements Closeable {
}
public CompletableFuture complete(URL lra) {
-HttpRequest request = HttpRequest.newBuilder()
-.uri(URI.create(lra.toString() + COORDINATOR_PATH_CLOSE))
-.header("Content-Type", "text/plain")
+HttpRequest request = prepareRequest(URI.create(lra.toString() +
COORDINATOR_PATH_CLOSE))
+.setHeader("Content-Type", "text/plain")
.PUT(HttpRequest.BodyPublishers.ofString(""))
.build();
@@ -148,9 +152,8 @@ public class LRAClient implements Closeable {
}
public CompletableFuture compensate(URL lra) {
-HttpRequest request = HttpRequest.newBuilder()
-.uri(URI.create(lra.toString() + COORDINATOR_PATH_CANCEL))
-.header("Content-Type", "text/plain")
+HttpRequest request = prepareRequest(URI.create(lra.toString() +
COORDINATOR_PATH_CANCEL))
+.setHeader("Content-Type", "text/plain")
.PUT(HttpRequest.BodyPublishers.ofString(""))
.build();
@@ -165,6 +168,10 @@ public class LRAClient implements Closeable {
});
}
+protected HttpRequest.Builder prepareRequest(URI uri) {
+return HttpRequest.newBuilder().uri(uri);
+}
+
private URL toURL(Object url) {
if (url == null) {
return null;
diff --git
a/components/camel-lra
[GitHub] [camel] davsclaus merged pull request #10505: Add possibility to override LRAClient
davsclaus merged PR #10505: URL: https://github.com/apache/camel/pull/10505 -- 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] hboutemy commented on a diff in pull request #10441: init outputTimestamp
hboutemy commented on code in PR #10441:
URL: https://github.com/apache/camel/pull/10441#discussion_r1244146816
##
pom.xml:
##
@@ -117,7 +117,7 @@
${jdk.version}
-1
+
1687211006
Review Comment:
it could have been, as it will be updated during release
but no, it was not random but `date +%s` as it is how release will update
the value
--
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] hboutemy commented on a diff in pull request #10441: init outputTimestamp
hboutemy commented on code in PR #10441:
URL: https://github.com/apache/camel/pull/10441#discussion_r1244146816
##
pom.xml:
##
@@ -117,7 +117,7 @@
${jdk.version}
-1
+
1687211006
Review Comment:
it could have been, as it will be updated during release
but no, it was not random but `date +%s`
--
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-website] github-actions[bot] commented on pull request #1018: (chores) doc: updated contributing guide
github-actions[bot] commented on PR #1018: URL: https://github.com/apache/camel-website/pull/1018#issuecomment-1609968900 🚀 Preview is available at https://pr-1018--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
[camel] branch regen_bot updated (885c26bf238 -> dfbaf4abee6)
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 885c26bf238 CAMEL-19492: Fix modifier orders to comply with the JLS add dfbaf4abee6 Camel-Salesforce: s390x support No new revisions were added by this update. Summary of changes: components/camel-salesforce/pom.xml | 38 +++-- 1 file changed, 7 insertions(+), 31 deletions(-)
[camel] branch main updated: Camel-Salesforce: s390x support
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 dfbaf4abee6 Camel-Salesforce: s390x support
dfbaf4abee6 is described below
commit dfbaf4abee662573adac190eb3f3f6049ed4f487
Author: Nayana Thorat
AuthorDate: Tue Jun 27 21:30:04 2023 +0530
Camel-Salesforce: s390x support
---
components/camel-salesforce/pom.xml | 38 +++--
1 file changed, 7 insertions(+), 31 deletions(-)
diff --git a/components/camel-salesforce/pom.xml
b/components/camel-salesforce/pom.xml
index 961f845..fc7236f63fe 100644
--- a/components/camel-salesforce/pom.xml
+++ b/components/camel-salesforce/pom.xml
@@ -32,6 +32,12 @@
Camel :: Salesforce :: Parent
Camel Salesforce parent
+
+camel-salesforce-component
+camel-salesforce-codegen
+camel-salesforce-maven-plugin
+
+
${project.basedir}
@@ -43,35 +49,5 @@
${sourcecheckExcludes},
-
-
-
-
-NotS390x
-
-
-!s390x
-
-
-
-camel-salesforce-component
-camel-salesforce-codegen
-camel-salesforce-maven-plugin
-
-
-
-
-s390x
-
-
-s390x
-
-
-
-camel-salesforce-codegen
-camel-salesforce-maven-plugin
-
-
-
-
+
[GitHub] [camel] orpiske merged pull request #10520: Camel-Salesforce: s390x support
orpiske merged PR #10520: URL: https://github.com/apache/camel/pull/10520 -- 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 closed pull request #10315: CAMEL-19433: Handle error while consuming records from topic
orpiske closed pull request #10315: CAMEL-19433: Handle error while consuming records from topic URL: https://github.com/apache/camel/pull/10315 -- 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] johnpoth commented on issue #4398: kamel run | custom dependencies | local files | K8S Cluster with GHCR
johnpoth commented on issue #4398: URL: https://github.com/apache/camel-k/issues/4398#issuecomment-1609899816 Hi @srikanthprathipati, Please have a look at the id tag. It needs to be equal to **image-registry** ``` image-registry srikanthprathipati * ``` -- 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 #10520: Camel-Salesforce: s390x support
github-actions[bot] commented on PR #10520: URL: https://github.com/apache/camel/pull/10520#issuecomment-1609889900 :no_entry_sign: There are (likely) no changes in core core 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] github-actions[bot] commented on pull request #10520: Camel-Salesforce: s390x support
github-actions[bot] commented on PR #10520: URL: https://github.com/apache/camel/pull/10520#issuecomment-1609889876 ### Components test results: | Total | Tested | Failed :x: | Passed :white_check_mark: | | --- | --- | --- | --- | | 1 | 1 | 0 | 1 | -- 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 (38d75174acb -> 885c26bf238)
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 38d75174acb Regen for commit 0ef44cd89040388b3c5ad39b1cdd4e1e4ce4f4b9 add 885c26bf238 CAMEL-19492: Fix modifier orders to comply with the JLS 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 (38d75174acb) \ N -- N -- N refs/heads/regen_bot (885c26bf238) 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: .../apache/camel/catalog/schemas/camel-spring.xsd | 12328 +-- .../java/org/apache/camel/xml/io/MXParser.java |26 +- 2 files changed, 5640 insertions(+), 6714 deletions(-)
[GitHub] [camel] orpiske merged pull request #10519: CAMEL-19492: Fix modifier orders to comply with the JLS
orpiske merged PR #10519: URL: https://github.com/apache/camel/pull/10519 -- 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 (2f9c257aedf -> 885c26bf238)
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 2f9c257aedf Fix release process add 885c26bf238 CAMEL-19492: Fix modifier orders to comply with the JLS No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/xml/io/MXParser.java | 26 +++--- 1 file changed, 13 insertions(+), 13 deletions(-)
[GitHub] [camel] github-actions[bot] commented on pull request #10520: Camel-Salesforce: s390x support
github-actions[bot] commented on PR #10520: URL: https://github.com/apache/camel/pull/10520#issuecomment-1609872139 :robot: The Apache Camel test robot will run the tests for you :+1: -- 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 commented on pull request #10520: Camel-Salesforce: s390x support
orpiske commented on PR #10520: URL: https://github.com/apache/camel/pull/10520#issuecomment-1609871863 /component-test camel-salesforce -- 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_3x updated (a7edeaa7386 -> e6e8d12737f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3x in repository https://gitbox.apache.org/repos/asf/camel.git from a7edeaa7386 CAMEL-19489: camel-minio - Update docs add e6e8d12737f CAMEL-19509: camel-yaml-dsl - Add support for kamelet binding with no sink No new revisions were added by this update. Summary of changes: .../camel/dsl/yaml/YamlRoutesBuilderLoader.java| 31 +++-- .../camel/dsl/yaml/KameletBindingLoaderTest.groovy | 36 + .../resources/kamelets/log-action.kamelet.yaml | 149 + 3 files changed, 202 insertions(+), 14 deletions(-) create mode 100644 dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/log-action.kamelet.yaml
[GitHub] [camel] github-actions[bot] commented on pull request #10519: CAMEL-19492: Fix modifier orders to comply with the JLS
github-actions[bot] commented on PR #10519: URL: https://github.com/apache/camel/pull/10519#issuecomment-1609839572 :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] github-actions[bot] commented on pull request #10519: CAMEL-19492: Fix modifier orders to comply with the JLS
github-actions[bot] commented on PR #10519: URL: https://github.com/apache/camel/pull/10519#issuecomment-1609839601 ### Core test results: | Tested | Failed :x: | Passed :white_check_mark: | | --- | --- | --- | | 1 | 1 | 0 | -- 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 closed pull request #10521: Generated sources regen
oscerd closed pull request #10521: Generated sources regen URL: https://github.com/apache/camel/pull/10521 -- 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 (2f9c257aedf -> 38d75174acb)
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 2f9c257aedf Fix release process add 38d75174acb Regen for commit 0ef44cd89040388b3c5ad39b1cdd4e1e4ce4f4b9 No new revisions were added by this update. Summary of changes: .../apache/camel/catalog/schemas/camel-spring.xsd | 12100 ++- 1 file changed, 6587 insertions(+), 5513 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #10521: Generated sources regen
github-actions[bot] opened a new pull request, #10521: URL: https://github.com/apache/camel/pull/10521 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-k] claudio4j commented on issue #4513: Allow to remote debug the Operator
claudio4j commented on issue #4513:
URL: https://github.com/apache/camel-k/issues/4513#issuecomment-1609827336
This is the launch.json
```
{
"name": "Camel K Operator - cluster",
"type": "go",
"debugAdapter": "dlv-dap", // `legacy` by default
"request": "attach",
"mode": "remote",
"port": 4040,
"host": "127.0.0.1", // can skip for localhost
"trace": "verbose",
"showLog": true,
"logOutput": "dap",
"substitutePath": [
{ "from": "${workspaceFolder}/cmd/kamel/main.go", "to":
"/usr/local/bin/kamel" },
]
}
```
I didn't spend much time investigating.
--
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 #10520: Camel-Salesforce: s390x support
github-actions[bot] commented on PR #10520: URL: https://github.com/apache/camel/pull/10520#issuecomment-1609818659 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- 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-spring-boot-examples] branch CAMEL-19510/fix-auto-configuration deleted (was 6a611e5)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch CAMEL-19510/fix-auto-configuration in repository https://gitbox.apache.org/repos/asf/camel-spring-boot-examples.git was 6a611e5 CAMEL-19510: reactive-streams - Fix the auto configuration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
