[GitHub] [camel] essobedo commented on pull request #6937: Use Maven daemon for the build pipeline
essobedo commented on pull request #6937: URL: https://github.com/apache/camel/pull/6937#issuecomment-1037050403 @orpiske ok no problem, let's wait for it. I converted it to draft, please let me know when it is done on your side. BTW could you please tell why you changed the type of event that triggers the build (from pull_request to push + pull_request_target)? -- 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: Fixed CS
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 4f7728b Fixed CS
4f7728b is described below
commit 4f7728b3b3b03babe2d497e1a45f612a51fd206f
Author: Claus Ibsen
AuthorDate: Sat Feb 12 08:24:39 2022 +0100
Fixed CS
---
.../apache/camel/maven/packaging/generics/PackagePluginUtils.java| 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/PackagePluginUtils.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/PackagePluginUtils.java
index 4dcb28a..d9606b4 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/PackagePluginUtils.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/PackagePluginUtils.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.maven.packaging.generics;
import java.io.IOException;
@@ -28,9 +27,9 @@ import org.apache.maven.project.MavenProject;
import org.jboss.jandex.Index;
import org.jboss.jandex.IndexReader;
-public class PackagePluginUtils {
-private PackagePluginUtils() {
+public final class PackagePluginUtils {
+private PackagePluginUtils() {
}
public static Index readJandexIndex(MavenProject project) throws
MojoExecutionException {
[camel] branch camel-3.11.x updated: [CAMEL-17618]follow up fix and re-enable failure test (#6938)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.11.x by this push:
new 5be4bb2 [CAMEL-17618]follow up fix and re-enable failure test (#6938)
5be4bb2 is described below
commit 5be4bb2646f99b540f0d4a2d981719392d946072
Author: Freeman(Yue) Fang
AuthorDate: Sat Feb 12 02:19:20 2022 -0500
[CAMEL-17618]follow up fix and re-enable failure test (#6938)
---
.../src/main/java/org/apache/camel/component/ref/RefEndpoint.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
b/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
index caef53d8..07f8859 100644
---
a/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
+++
b/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
@@ -77,7 +77,8 @@ public class RefEndpoint extends DefaultEndpoint implements
DelegateEndpoint {
if (endpoint == null) {
// endpoint is mandatory
endpoint = CamelContextHelper.mandatoryLookup(getCamelContext(),
name, Endpoint.class);
-if (getCamelContext().getEndpoint(getEndpoint().getEndpointUri())
== null) {
+if (getCamelContext().getEndpoint(getEndpoint().getEndpointUri())
== null
+||
getCamelContext().getEndpoint(getEndpoint().getEndpointUri()) != endpoint) {
getCamelContext().addEndpoint(getEndpoint().getEndpointUri(),
endpoint);
}
}
[camel] branch camel-3.14.x updated: [CAMEL-17618]follow up fix and re-enable failure test (#6938)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.14.x by this push:
new b986248 [CAMEL-17618]follow up fix and re-enable failure test (#6938)
b986248 is described below
commit b9862488dfd4aa49f2e5f86f4f20df5210fa616a
Author: Freeman(Yue) Fang
AuthorDate: Sat Feb 12 02:19:20 2022 -0500
[CAMEL-17618]follow up fix and re-enable failure test (#6938)
---
.../src/main/java/org/apache/camel/component/ref/RefEndpoint.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
b/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
index caef53d8..07f8859 100644
---
a/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
+++
b/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
@@ -77,7 +77,8 @@ public class RefEndpoint extends DefaultEndpoint implements
DelegateEndpoint {
if (endpoint == null) {
// endpoint is mandatory
endpoint = CamelContextHelper.mandatoryLookup(getCamelContext(),
name, Endpoint.class);
-if (getCamelContext().getEndpoint(getEndpoint().getEndpointUri())
== null) {
+if (getCamelContext().getEndpoint(getEndpoint().getEndpointUri())
== null
+||
getCamelContext().getEndpoint(getEndpoint().getEndpointUri()) != endpoint) {
getCamelContext().addEndpoint(getEndpoint().getEndpointUri(),
endpoint);
}
}
[camel] branch main updated: [CAMEL-17618]follow up fix and re-enable failure test (#6938)
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 9a348d7 [CAMEL-17618]follow up fix and re-enable failure test (#6938)
9a348d7 is described below
commit 9a348d798654b0631b27a92fd248c07f55736b64
Author: Freeman(Yue) Fang
AuthorDate: Sat Feb 12 02:19:20 2022 -0500
[CAMEL-17618]follow up fix and re-enable failure test (#6938)
---
.../org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java | 2 --
.../src/main/java/org/apache/camel/component/ref/RefEndpoint.java | 3 ++-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
index e2a85af..27e3749 100644
---
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
@@ -26,7 +26,6 @@ import org.apache.camel.util.IOHelper;
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.NoSuchCodeLitFault;
import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -66,7 +65,6 @@ public abstract class AbstractCXFGreeterRouterTest extends
CamelSpringTestSuppor
}
@Test
-@Disabled
public void testInvokingServiceFromCXFClient() throws Exception {
Service service = Service.create(serviceName);
service.addPort(routerPortName, "http://schemas.xmlsoap.org/soap/;,
diff --git
a/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
b/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
index caef53d8..07f8859 100644
---
a/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
+++
b/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
@@ -77,7 +77,8 @@ public class RefEndpoint extends DefaultEndpoint implements
DelegateEndpoint {
if (endpoint == null) {
// endpoint is mandatory
endpoint = CamelContextHelper.mandatoryLookup(getCamelContext(),
name, Endpoint.class);
-if (getCamelContext().getEndpoint(getEndpoint().getEndpointUri())
== null) {
+if (getCamelContext().getEndpoint(getEndpoint().getEndpointUri())
== null
+||
getCamelContext().getEndpoint(getEndpoint().getEndpointUri()) != endpoint) {
getCamelContext().addEndpoint(getEndpoint().getEndpointUri(),
endpoint);
}
}
[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 01a3988 Regen
01a3988 is described below
commit 01a3988b03273f2e0e7eb724868804bdb0a364d4
Author: Claus Ibsen
AuthorDate: Sat Feb 12 08:18:57 2022 +0100
Regen
---
.../camel/maven/packaging/AbstractGenerateConfigurerMojo.java | 2 --
.../main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java | 3 ++-
.../camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java | 6 --
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
index 00ded04..337eb45 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
@@ -187,8 +187,6 @@ public abstract class AbstractGenerateConfigurerMojo
extends AbstractGeneratorMo
}
}
-
-
private void addToSets(
AnnotationInstance annotation, Set
bootstrapAndExtendedSet, String currentClass, Set bootstrapSet,
Set extendedSet, Set set) {
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index 314aac2..3a6cf50 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -429,7 +429,8 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
}
}
-private Method doAddMethod(JavaClass javaClass, JavaClass builderClass,
JavaClass dslClass, ComponentModel componentModel, String methodName) {
+private Method doAddMethod(
+JavaClass javaClass, JavaClass builderClass, JavaClass dslClass,
ComponentModel componentModel, String methodName) {
return dslClass.addMethod().setStatic().setName(methodName)
.addParameter(String.class, "path")
.setReturnType(new
GenericType(loadClass(builderClass.getCanonicalName(
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java
index 8e3cb57..7cc3e2f 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java
@@ -17,12 +17,7 @@
package org.apache.camel.maven.packaging;
import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
import java.lang.reflect.Modifier;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.LinkedHashSet;
@@ -45,7 +40,6 @@ import org.jboss.jandex.AnnotationValue;
import org.jboss.jandex.ClassInfo.NestingType;
import org.jboss.jandex.DotName;
import org.jboss.jandex.Index;
-import org.jboss.jandex.IndexReader;
import org.jboss.jandex.MethodInfo;
import org.jboss.jandex.Type;
[GitHub] [camel] davsclaus merged pull request #6938: [CAMEL-17618]follow up fix and re-enable failure test
davsclaus merged pull request #6938: URL: https://github.com/apache/camel/pull/6938 -- 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 #6937: Use Maven daemon for the build pipeline
orpiske commented on pull request #6937: URL: https://github.com/apache/camel/pull/6937#issuecomment-1037037644 Thanks for the contribution! I like the idea of trying mvnd on GH actions. However, Let's wait a bit on this one, please. I am working with folks from SonarCloud to diagnose and fix the automated PR analysis. That depends on plain Maven. We probably will need a few more days to fix everything. -- 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 (41c288c -> f2b7575)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from 41c288c (chores) camel-bundle-plugin: a few minor cleanups (#6934) add f2b7575 (chores) camel-maven-package-plugin: consolidate duplicated logic (#6935) No new revisions were added by this update. Summary of changes: .../packaging/AbstractGenerateConfigurerMojo.java | 11 +++ .../camel/maven/packaging/EndpointDslMojo.java | 25 +++ .../TypeConverterLoaderGeneratorMojo.java | 9 ++ .../packaging/generics/PackagePluginUtils.java | 37 -- 4 files changed, 38 insertions(+), 44 deletions(-) copy components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobTestUtils.java => tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/PackagePluginUtils.java (53%)
[camel] branch main updated: (chores) camel-bundle-plugin: a few minor cleanups (#6934)
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 41c288c (chores) camel-bundle-plugin: a few minor cleanups (#6934)
41c288c is described below
commit 41c288ced51415729c962fc70eb10220194fa320
Author: Otavio Rodolfo Piske
AuthorDate: Sat Feb 12 08:13:05 2022 +0100
(chores) camel-bundle-plugin: a few minor cleanups (#6934)
* (chores) camel-bundle-plugin: use final variables and fields when possible
* (chores) camel-bundle-plugin: use modern Java language features when
possible
* (chores) camel-bundle-plugin: avoid unnecessary call to toString()
* (chores) camel-bundle-plugin: removed unused and/or dead code
* (chores) camel-bundle-plugin: ensure IO is safe
Ensures the handling of the output stream is handled within the
try-with-resources block
* (chores) camel-bundle-plugin: removed unused exceptions
---
.../apache/felix/bundleplugin/ManifestPlugin.java | 76 +++---
1 file changed, 25 insertions(+), 51 deletions(-)
diff --git
a/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
b/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
index 8944cbb..32308ce 100644
---
a/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
+++
b/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
@@ -32,7 +32,6 @@ import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.util.Arrays;
import java.util.Iterator;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -166,27 +165,6 @@ public class ManifestPlugin extends BundlePlugin {
return scanner.getIncludedFiles().length > 0;
}
-public Manifest getManifest(MavenProject project, ClassPathItem[]
classpath)
-throws IOException, MojoFailureException, MojoExecutionException,
Exception {
-return getManifest(project, new LinkedHashMap(),
classpath, buildContext);
-}
-
-public Manifest getManifest(MavenProject project, Map
instructions, ClassPathItem[] classpath,
-BuildContext buildContext) throws IOException,
MojoFailureException, MojoExecutionException, Exception {
-Analyzer analyzer = getAnalyzer(project, instructions, classpath);
-
-Jar jar = analyzer.getJar();
-Manifest manifest = jar.getManifest();
-
-if (exportScr) {
-exportScr(analyzer, jar, scrLocation, buildContext, getLog());
-}
-
-// cleanup...
-analyzer.close();
-
-return manifest;
-}
private static void exportScr(Analyzer analyzer, Jar jar, File
scrLocation, BuildContext buildContext, Log log)
throws Exception {
@@ -227,13 +205,8 @@ public class ManifestPlugin extends BundlePlugin {
}
}
-protected Analyzer getAnalyzer(MavenProject project, ClassPathItem[]
classpath)
-throws IOException, MojoExecutionException, Exception {
-return getAnalyzer(project, new LinkedHashMap<>(), classpath);
-}
-
protected Analyzer getAnalyzer(MavenProject project, Map
instructions, ClassPathItem[] classpath)
-throws IOException, MojoExecutionException, Exception {
+throws Exception {
if (rebuildBundle &&
supportedProjectTypes.contains(project.getArtifact().getType())) {
return buildOSGiBundle(project, instructions, classpath);
}
@@ -325,13 +298,8 @@ public class ManifestPlugin extends BundlePlugin {
private boolean isUpToDate(MavenProject project) throws
MojoExecutionException {
try {
Path cacheData = getIncrementalDataPath(project);
-String prvdata;
-if (Files.isRegularFile(cacheData)) {
-prvdata = new String(Files.readAllBytes(cacheData),
StandardCharsets.UTF_8);
-} else {
-prvdata = null;
-}
-String curdata = getIncrementalData();
+final String prvdata = getPreviousRunData(cacheData);
+final String curdata = getIncrementalData();
if (curdata.equals(prvdata)) {
long lastmod = Files.getLastModifiedTime(cacheData).toMillis();
Set stale = Stream
@@ -363,6 +331,16 @@ public class ManifestPlugin extends BundlePlugin {
return false;
}
+private String getPreviousRunData(Path cacheData) throws IOException {
+String prvdata;
+if (Files.isRegularFile(cacheData)) {
+prvdata = new String(Files.readAllBytes(cacheData),
StandardCharsets.UTF_8);
+} else {
+prvdata = null;
+}
+return prvdata;
+}
+
[GitHub] [camel] davsclaus merged pull request #6935: Last round of cleanups for the camel-maven-package-plugin
davsclaus merged pull request #6935: URL: https://github.com/apache/camel/pull/6935 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus merged pull request #6934: (chores) camel-bundle-plugin: a few minor cleanups
davsclaus merged pull request #6934: URL: https://github.com/apache/camel/pull/6934 -- 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] 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-1037015490 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 1832463678-660-c78ed31b-d084-4036-9bfe-f866d6686a76 * Camel Quarkus Commit: 297965b0fd398e6e30625c73763facbaf7bb5c48 * Quarkus Main Commit: ad7aa0f7661865fd70c968bf783b39ded3e96ea5 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/1832463678 -- 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] 02/02: Temporary hacks to handle version misalignment of smallrye-health and smallrye-faulttolerance in Quarkus & Camel
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 39dc12981771f59d3bafae23000b26951ac20495
Author: James Netherton
AuthorDate: Fri Feb 11 10:08:03 2022 +
Temporary hacks to handle version misalignment of smallrye-health and
smallrye-faulttolerance in Quarkus & Camel
---
.../MicroprofileFaultToleranceProcessor.java | 9 +
.../microprofile-fault-tolerance/runtime/pom.xml | 2 +
.../FaultToleranceConfiguration.java | 120 +
.../faulttolerance/FaultToleranceConstants.java} | 21 +-
.../faulttolerance/FaultToleranceProcessor.java| 536 +
.../FaultToleranceProcessorFactory.java} | 28 +-
.../faulttolerance/FaultToleranceReifier.java | 193
.../apache/camel/model/CircuitBreakerDefinition| 18 +
.../runtime/CamelMicroProfileHealthRecorder.java | 3 +-
...amelQuarkusMicroProfileHealthCheckRegistry.java | 46 ++
10 files changed, 942 insertions(+), 34 deletions(-)
diff --git
a/extensions/microprofile-fault-tolerance/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/fault/tolerance/deployment/MicroprofileFaultToleranceProcessor.java
b/extensions/microprofile-fault-tolerance/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/fault/tolerance/deployment/MicroprofileFaultToleranceProcessor.java
index 05673b1..6e8c382 100644
---
a/extensions/microprofile-fault-tolerance/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/fault/tolerance/deployment/MicroprofileFaultToleranceProcessor.java
+++
b/extensions/microprofile-fault-tolerance/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/fault/tolerance/deployment/MicroprofileFaultToleranceProcessor.java
@@ -16,9 +16,13 @@
*/
package
org.apache.camel.quarkus.component.microprofile.fault.tolerance.deployment;
+import java.nio.file.Paths;
+
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import
io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import
org.apache.camel.component.microprofile.faulttolerance.FaultToleranceProcessorFactory;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceBuildItem;
class MicroprofileFaultToleranceProcessor {
@@ -35,4 +39,9 @@ class MicroprofileFaultToleranceProcessor {
"META-INF/services/org/apache/camel/model/CircuitBreakerDefinition");
}
+@BuildStep
+CamelServiceBuildItem camelCronServicePattern() {
+return new
CamelServiceBuildItem(Paths.get("META-INF/services/org/apache/camel/model/CircuitBreakerDefinition"),
+FaultToleranceProcessorFactory.class.getName());
+}
}
diff --git a/extensions/microprofile-fault-tolerance/runtime/pom.xml
b/extensions/microprofile-fault-tolerance/runtime/pom.xml
index 3401f07..22e3962 100644
--- a/extensions/microprofile-fault-tolerance/runtime/pom.xml
+++ b/extensions/microprofile-fault-tolerance/runtime/pom.xml
@@ -56,10 +56,12 @@
org.apache.camel.quarkus
camel-quarkus-core
+
diff --git
a/extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceConfiguration.java
b/extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceConfiguration.java
new file mode 100644
index 000..7cb3d4d
--- /dev/null
+++
b/extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceConfiguration.java
@@ -0,0 +1,120 @@
+/*
+ * 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.microprofile.faulttolerance;
+
+public class FaultToleranceConfiguration {
+
+private long delay;
+private int successThreshold;
+private int requestVolumeThreshold;
+private float failureRatio;
+private boolean timeoutEnabled;
+private long timeoutDuration;
+private
[camel-quarkus] 01/02: Upgrade Camel to 3.16.0
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 524d938126247a2e029fb4e80a6396258ce3666a
Author: James Netherton
AuthorDate: Wed Feb 9 11:13:37 2022 +
Upgrade Camel to 3.16.0
---
docs/antora.yml| 6 +-
.../ROOT/pages/reference/extensions/yaml-dsl.adoc | 6 --
.../it/health/CustomHealthCheckRepository.java | 17 --
.../microprofile/it/health/FailingHealthCheck.java | 2 +-
.../it/health/FailureThresholdHealthCheck.java | 51
.../it/health/MicroProfileHealthResource.java | 17 +-
.../src/main/resources/application.properties | 7 +--
.../it/health/MicroProfileHealthTest.java | 67 --
pom.xml| 6 +-
9 files changed, 9 insertions(+), 170 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 1413755..0d85853 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -29,11 +29,11 @@ asciidoc:
min-maven-version: 3.8.1 # replace ${min-maven-version}
target-maven-version: 3.8.4 # replace ${target-maven-version}
-camel-version: 3.15.0 # replace ${camel.version}
-camel-docs-version: 3.15.x # replace ${camel.docs.components.version}
+camel-version: 3.16.0-SNAPSHOT # replace ${camel.version}
+camel-docs-version: 3.16.x # replace ${camel.docs.components.version}
quarkus-version: 2.7.1.Final # replace ${quarkus.version}
graalvm-version: 21.3.1 # replace ${graalvm.version}
graalvm-docs-version: 21.3
# attributes used in xrefs to other Antora components
-cq-camel-components: 3.15.x@components # replace
${camel.docs.components.xref}
+cq-camel-components: 3.16.x@components # replace
${camel.docs.components.xref}
quarkus-examples-version: latest
diff --git a/docs/modules/ROOT/pages/reference/extensions/yaml-dsl.adoc
b/docs/modules/ROOT/pages/reference/extensions/yaml-dsl.adoc
index bdde5d3..26484a9 100644
--- a/docs/modules/ROOT/pages/reference/extensions/yaml-dsl.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/yaml-dsl.adoc
@@ -16,12 +16,6 @@
An YAML stack for parsing YAML route definitions
-== What's inside
-
-* xref:{cq-camel-components}:others:yaml-dsl.adoc[YAML DSL]
-
-Please refer to the above link for usage and configuration details.
-
== Maven coordinates
https://code.quarkus.io/?extension-search=camel-quarkus-yaml-dsl[Create a new
project with this extension on code.quarkus.io, window="_blank"]
diff --git
a/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/CustomHealthCheckRepository.java
b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/CustomHealthCheckRepository.java
index c54665d..2d31330 100644
---
a/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/CustomHealthCheckRepository.java
+++
b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/CustomHealthCheckRepository.java
@@ -16,12 +16,10 @@
*/
package org.apache.camel.quarkus.component.microprofile.it.health;
-import java.util.Collections;
import java.util.Map;
import java.util.stream.Stream;
import org.apache.camel.health.HealthCheck;
-import org.apache.camel.health.HealthCheckConfiguration;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.health.HealthCheckResultBuilder;
import org.apache.camel.impl.health.AbstractHealthCheck;
@@ -44,21 +42,6 @@ public class CustomHealthCheckRepository implements
HealthCheckRepository {
}
@Override
-public void setConfigurations(Map
configurations) {
-// Noop
-}
-
-@Override
-public Map getConfigurations() {
-return Collections.emptyMap();
-}
-
-@Override
-public void addConfiguration(String id, HealthCheckConfiguration
configuration) {
-// Noop
-}
-
-@Override
public Stream stream() {
return Stream.of(check);
}
diff --git
a/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/FailingHealthCheck.java
b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/FailingHealthCheck.java
index 2d56d54..b278052 100644
---
a/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/FailingHealthCheck.java
+++
b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/FailingHealthCheck.java
@@ -25,7 +25,7 @@ public class FailingHealthCheck extends AbstractHealthCheck {
public FailingHealthCheck() {
super("failing-check");
-getConfiguration().setEnabled(false);
+
[camel-quarkus] branch camel-main updated (f7e29e6 -> 39dc129)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. discard f7e29e6 Temporary hacks to handle version misalignment of smallrye-health and smallrye-faulttolerance in Quarkus & Camel discard 195f7a8 Upgrade Camel to 3.16.0 add e72113e Poll for optaplanner results to avoid timeouts on slow machines add 242bae0 Remove duplicate software.amazon.awssdk:iam dependency declaration add 724d328 Honor extension deprecation in Catalog and in documentation add ad7aa0f Deprecate camel-quarkus-spark #3466 new 524d938 Upgrade Camel to 3.16.0 new 39dc129 Temporary hacks to handle version misalignment of smallrye-health and smallrye-faulttolerance in Quarkus & Camel 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 (f7e29e6) \ N -- N -- N refs/heads/camel-main (39dc129) 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: docs/modules/ROOT/examples/components/spark.yml| 2 +- .../ROOT/pages/reference/extensions/spark.adoc | 6 +- extensions-jvm/spark/runtime/pom.xml | 1 + .../main/resources/META-INF/quarkus-extension.yaml | 1 + integration-tests/aws2-grouped/pom.xml | 5 -- integration-tests/optaplanner/pom.xml | 12 ++- .../optaplanner/it/OptaplannerResource.java| 85 +-- .../quarkus/component/optaplanner/it/Routes.java | 15 ++-- .../component/optaplanner/it/OptaplannerTest.java | 98 ++ .../camel/quarkus/maven/CamelQuarkusExtension.java | 9 ++ .../org/apache/camel/quarkus/maven/CqUtils.java| 4 +- .../quarkus/maven/PrepareCatalogQuarkusMojo.java | 2 +- .../quarkus/maven/UpdateExtensionDocPageMojo.java | 2 +- 13 files changed, 178 insertions(+), 64 deletions(-)
[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 7f937f9 Updated CHANGELOG.md 7f937f9 is described below commit 7f937f9e2163d76f7d8a1eb58f3a77997946d162 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Feb 12 03:12:07 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 8 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 04beb69..ed0c551 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,12 +19,19 @@ - \[Camel 3.15\] Fhir tests are failing [\#3416](https://github.com/apache/camel-quarkus/issues/3416) - Better integration with Quarkus OpenAPI & OpenAPI Swagger UI [\#3346](https://github.com/apache/camel-quarkus/issues/3346) - Run integration tests on Windows [\#3342](https://github.com/apache/camel-quarkus/issues/3342) +- `DebeziumMongodbTest` skipped tests [\#3213](https://github.com/apache/camel-quarkus/issues/3213) +- spark:hive is does not work [\#1956](https://github.com/apache/camel-quarkus/issues/1956) +- spark:dataframe does not work on Java 11 [\#1955](https://github.com/apache/camel-quarkus/issues/1955) +- \[Dependency hell\] Spark native support [\#1701](https://github.com/apache/camel-quarkus/issues/1701) - A tool to check/sync dependency versions with camel & quarkus [\#1684](https://github.com/apache/camel-quarkus/issues/1684) - Cannot build project on Windows [\#1429](https://github.com/apache/camel-quarkus/issues/1429) - rest-dsl - Integrate with quarkus-openapi [\#383](https://github.com/apache/camel-quarkus/issues/383) **Merged pull requests:** +- Deprecate camel-quarkus-spark [\#3544](https://github.com/apache/camel-quarkus/pull/3544) ([ppalaga](https://github.com/ppalaga)) +- Remove duplicate software.amazon.awssdk:iam dependency declaration [\#3543](https://github.com/apache/camel-quarkus/pull/3543) ([jamesnetherton](https://github.com/jamesnetherton)) +- Poll for optaplanner results to avoid timeouts on slow machines [\#3542](https://github.com/apache/camel-quarkus/pull/3542) ([jamesnetherton](https://github.com/jamesnetherton)) - Disable flaky messaging resequence test on GitHub CI \(\#2957\) [\#3540](https://github.com/apache/camel-quarkus/pull/3540) ([jamesnetherton](https://github.com/jamesnetherton)) - Upgrade Maven Wrapper to 3.1.0 [\#3539](https://github.com/apache/camel-quarkus/pull/3539) ([jamesnetherton](https://github.com/jamesnetherton)) - Run integration tests on Windows [\#3537](https://github.com/apache/camel-quarkus/pull/3537) ([jamesnetherton](https://github.com/jamesnetherton)) @@ -146,6 +153,7 @@ - Sql doc update because of the failure with external oracle database \#… [\#3272](https://github.com/apache/camel-quarkus/pull/3272) ([JiriOndrusek](https://github.com/JiriOndrusek)) - avro: Fix the documentation about avro schema build time parsing \#3270 [\#3271](https://github.com/apache/camel-quarkus/pull/3271) ([aldettinger](https://github.com/aldettinger)) - Added missing stored procedure test for oracle [\#3269](https://github.com/apache/camel-quarkus/pull/3269) ([JiriOndrusek](https://github.com/JiriOndrusek)) +- DebeziumMongodbTest skipped tests \#3213 [\#3266](https://github.com/apache/camel-quarkus/pull/3266) ([JiriOndrusek](https://github.com/JiriOndrusek)) - Remove not needed anymore BeansWeakCache substitution. Closes \#3226 [\#3264](https://github.com/apache/camel-quarkus/pull/3264) ([vladimirfx](https://github.com/vladimirfx)) - Fixup 218bef4 Deactivate the virtualDepenencies profile via -DnoVirtu… [\#3263](https://github.com/apache/camel-quarkus/pull/3263) ([ppalaga](https://github.com/ppalaga)) - Cannot run tests against alternative BOMs [\#3262](https://github.com/apache/camel-quarkus/pull/3262) ([ppalaga](https://github.com/ppalaga))
[camel-k] 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.git The following commit(s) were added to refs/heads/main by this push: new 478ca56 Updated CHANGELOG.md 478ca56 is described below commit 478ca56e54eadc3cfa9a10bf592935a34d37d9e7 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Feb 12 03:09:32 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2533792..d9d7995 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ **Closed issues:** +- kamel client for macOS from release 1.8.0 is really 1.0.0-M4 [\#3006](https://github.com/apache/camel-k/issues/3006) +- SEDA multiple threads not working [\#3001](https://github.com/apache/camel-k/issues/3001) - Errored status Kamelet cannot be reconciled to Ready status [\#2988](https://github.com/apache/camel-k/issues/2988) - Kamel install failure [\#2987](https://github.com/apache/camel-k/issues/2987) - Configure Maven: Artifact Repository is not recognized [\#2966](https://github.com/apache/camel-k/issues/2966)
[GitHub] [camel-karavan] mgubaidullin merged pull request #187: Bean ref for components
mgubaidullin merged pull request #187: URL: https://github.com/apache/camel-karavan/pull/187 -- 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-karavan] branch main updated: Bean ref for componentns (#187)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new c575021 Bean ref for componentns (#187)
c575021 is described below
commit c5750213f3df1e398ec3b7716751f24119479536
Author: Marat Gubaidullin
AuthorDate: Fri Feb 11 17:25:13 2022 -0500
Bean ref for componentns (#187)
---
karavan-demo/integrations/sql-to-log-int.yaml | 26 +
karavan-demo/integrations/sql-to-log.yaml | 45 +-
.../route/property/ComponentParameterField.tsx | 3 +-
3 files changed, 46 insertions(+), 28 deletions(-)
diff --git a/karavan-demo/integrations/sql-to-log-int.yaml
b/karavan-demo/integrations/sql-to-log-int.yaml
new file mode 100644
index 000..9e2d371
--- /dev/null
+++ b/karavan-demo/integrations/sql-to-log-int.yaml
@@ -0,0 +1,26 @@
+apiVersion: camel.apache.org/v1
+kind: Integration
+metadata:
+ name: sql-to-log.yaml
+spec:
+ dependencies:
+- 'mvn:org.apache.commons:commons-dbcp2:2.9.0'
+- 'mvn:org.postgresql:postgresql:42.2.14'
+ flows:
+- from:
+parameters:
+ dataSource: '#bean:datasource'
+steps:
+ - marshal:
+ json:
+library: Jackson
+ - log: '${body}'
+uri: 'sql:SELECT * FROM table1'
+- beans:
+- name: datasource
+ properties:
+driverClassName: org.postgresql.Driver
+password: postgres
+url: 'jdbc:postgresql:localhost:5432:demo'
+username: postgres
+ type: 'org.apache.commons.dbcp2.BasicDataSource'
\ No newline at end of file
diff --git a/karavan-demo/integrations/sql-to-log.yaml
b/karavan-demo/integrations/sql-to-log.yaml
index c657a25..85d9467 100644
--- a/karavan-demo/integrations/sql-to-log.yaml
+++ b/karavan-demo/integrations/sql-to-log.yaml
@@ -1,27 +1,18 @@
-apiVersion: camel.apache.org/v1
-kind: Integration
-metadata:
- name: sql-to-log.yaml
-spec:
- dependencies:
- - "mvn:org.postgresql:postgresql:42.2.14"
- - "mvn:org.apache.commons:commons-dbcp2:2.9.0"
- flows:
-- route:
-from:
- uri: "sql:SELECT * FROM table1"
- parameters:
-dataSource: "datasource"
- steps:
- - marshal:
- json:
-library: Jackson
- - log: "${body}"
-- beans:
-- name: datasource
- type: "org.apache.commons.dbcp2.BasicDataSource"
- properties:
-username: postgres
-password: postgres
-url: jdbc:postgresql:localhost:5432:demo
-driverClassName: org.postgresql.Driver
+# camel-k: dependency=mvn:org.apache.commons:commons-dbcp2:2.9.0
dependency=mvn:org.postgresql:postgresql:42.2.14
+- from:
+uri: "sql:SELECT * FROM table1"
+parameters:
+ dataSource: "#bean:datasource"
+steps:
+ - marshal:
+ json:
+library: Jackson
+ - log: "${body}"
+- beans:
+- name: datasource
+ type: "org.apache.commons.dbcp2.BasicDataSource"
+ properties:
+username: postgres
+password: postgres
+url: jdbc:postgresql:localhost:5432:demo
+driverClassName: org.postgresql.Driver
diff --git
a/karavan-designer/src/designer/route/property/ComponentParameterField.tsx
b/karavan-designer/src/designer/route/property/ComponentParameterField.tsx
index 7b198b1..69322dc 100644
--- a/karavan-designer/src/designer/route/property/ComponentParameterField.tsx
+++ b/karavan-designer/src/designer/route/property/ComponentParameterField.tsx
@@ -33,6 +33,7 @@ import {CamelUi} from "../../utils/CamelUi";
import {Integration} from "karavan-core/lib/model/CamelDefinition";
const prefix = "parameters";
+const beanPrefix = "#bean:";
interface Props {
property: ComponentProperty,
@@ -69,7 +70,7 @@ export class ComponentParameterField extends
React.Component {
const beans = CamelUi.getBeans(this.props.integration);
if (beans) {
selectOptions.push();
-selectOptions.push(...beans.map((bean) => ));
+selectOptions.push(...beans.map((bean) => ));
}
return (
[camel-quarkus] 01/02: Honor extension deprecation in Catalog and in documentation
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 724d328340006a4d939d2a7a4cf6ad3c11f869ea
Author: Peter Palaga
AuthorDate: Fri Feb 11 17:06:58 2022 +0100
Honor extension deprecation in Catalog and in documentation
---
.../org/apache/camel/quarkus/maven/CamelQuarkusExtension.java| 9 +
.../src/main/java/org/apache/camel/quarkus/maven/CqUtils.java| 4 ++--
.../apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java| 2 +-
.../apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java | 2 +-
4 files changed, 13 insertions(+), 4 deletions(-)
diff --git
a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CamelQuarkusExtension.java
b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CamelQuarkusExtension.java
index c6999ca..785c301 100644
---
a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CamelQuarkusExtension.java
+++
b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CamelQuarkusExtension.java
@@ -75,6 +75,7 @@ public class CamelQuarkusExtension {
: ExtensionStatus.valueOf(extensionStatus);
final boolean unlisted = !nativeSupported
||
Boolean.parseBoolean(props.getProperty("quarkus.metadata.unlisted", "false"));
+final boolean deprecated =
Boolean.parseBoolean(props.getProperty("quarkus.metadata.deprecated", "false"));
final String rawKind = (String) props.get(CAMEL_QUARKUS_KIND);
final Kind kind = rawKind == null ? null : Kind.valueOf(rawKind);
@@ -92,6 +93,7 @@ public class CamelQuarkusExtension {
nativeSupported,
status,
unlisted,
+deprecated,
deps == null ? Collections.emptyList() :
Collections.unmodifiableList(deps),
kind,
props.getProperty("cq.quarkus.aws.client.baseName"),
@@ -114,6 +116,7 @@ public class CamelQuarkusExtension {
private final List dependencies;
private final ExtensionStatus status;
private final boolean unlisted;
+private final boolean deprecated;
private final Kind kind;
private final String quarkusAwsClientBaseName;
private final String quarkusAwsClientFqClassName;
@@ -131,6 +134,7 @@ public class CamelQuarkusExtension {
boolean nativeSupported,
ExtensionStatus status,
boolean unlisted,
+boolean deprecated,
List dependencies,
Kind kind,
String quarkusAwsClientBaseName,
@@ -148,6 +152,7 @@ public class CamelQuarkusExtension {
this.nativeSupported = nativeSupported;
this.status = status;
this.unlisted = unlisted;
+this.deprecated = deprecated;
this.dependencies = dependencies;
this.kind = kind;
this.quarkusAwsClientBaseName = quarkusAwsClientBaseName;
@@ -210,6 +215,10 @@ public class CamelQuarkusExtension {
return unlisted;
}
+public boolean isDeprecated() {
+return deprecated;
+}
+
public Kind getKind() {
return kind;
}
diff --git
a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CqUtils.java
b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CqUtils.java
index b22e83d..da3c906 100644
---
a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CqUtils.java
+++
b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CqUtils.java
@@ -229,8 +229,8 @@ public class CqUtils {
}
}
-public static boolean isDeprecated(String title,
Collection> models) {
-return title.contains("(deprecated)") || models.stream().anyMatch(m ->
m.isDeprecated());
+public static boolean isDeprecated(String title,
Collection> models, boolean deprecated) {
+return deprecated || title.contains("(deprecated)") ||
models.stream().anyMatch(m -> m.isDeprecated());
}
static Path copyJar(Path localRepository, String groupId, String
artifactId, String version) {
diff --git
a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java
b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java
index 936989b..5e2fc00 100644
---
a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java
+++
b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java
@@ -133,7 +133,7 @@ public class PrepareCatalogQuarkusMojo extends
AbstractExtensionListMojo {
model.setTitle(title);
model.setDescription(ext.getDescription().orElseThrow(() -> new
RuntimeException(
[camel-quarkus] 02/02: Deprecate camel-quarkus-spark #3466
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit ad7aa0f7661865fd70c968bf783b39ded3e96ea5 Author: Peter Palaga AuthorDate: Fri Feb 11 16:51:42 2022 +0100 Deprecate camel-quarkus-spark #3466 --- docs/modules/ROOT/examples/components/spark.yml | 2 +- docs/modules/ROOT/pages/reference/extensions/spark.adoc | 6 +++--- extensions-jvm/spark/runtime/pom.xml| 1 + .../runtime/src/main/resources/META-INF/quarkus-extension.yaml | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/modules/ROOT/examples/components/spark.yml b/docs/modules/ROOT/examples/components/spark.yml index 114b0db..d892cda 100644 --- a/docs/modules/ROOT/examples/components/spark.yml +++ b/docs/modules/ROOT/examples/components/spark.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-spark cqArtifactIdBase: spark cqNativeSupported: false cqStatus: Preview -cqDeprecated: false +cqDeprecated: true cqJvmSince: 1.3.0 cqNativeSince: n/a cqCamelPartName: spark diff --git a/docs/modules/ROOT/pages/reference/extensions/spark.adoc b/docs/modules/ROOT/pages/reference/extensions/spark.adoc index 3f3cfaa..41dbc25 100644 --- a/docs/modules/ROOT/pages/reference/extensions/spark.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/spark.adoc @@ -5,14 +5,14 @@ :cq-artifact-id: camel-quarkus-spark :cq-native-supported: false :cq-status: Preview -:cq-status-deprecation: Preview +:cq-status-deprecation: Preview Deprecated :cq-description: Send RDD or DataFrame jobs to Apache Spark clusters. -:cq-deprecated: false +:cq-deprecated: true :cq-jvm-since: 1.3.0 :cq-native-since: n/a [.badges] -[.badge-key]##JVM since##[.badge-supported]##1.3.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## +[.badge-key]##JVM since##[.badge-supported]##1.3.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## Send RDD or DataFrame jobs to Apache Spark clusters. diff --git a/extensions-jvm/spark/runtime/pom.xml b/extensions-jvm/spark/runtime/pom.xml index fa897cc..13fa30a 100644 --- a/extensions-jvm/spark/runtime/pom.xml +++ b/extensions-jvm/spark/runtime/pom.xml @@ -32,6 +32,7 @@ 1.3.0 +true diff --git a/extensions-jvm/spark/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-jvm/spark/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 1f0d82e..eadc790 100644 --- a/extensions-jvm/spark/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions-jvm/spark/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -30,3 +30,4 @@ metadata: - "integration" status: - "preview" + - "deprecated" \ No newline at end of file
[camel-quarkus] branch main updated (242bae0 -> ad7aa0f)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. from 242bae0 Remove duplicate software.amazon.awssdk:iam dependency declaration new 724d328 Honor extension deprecation in Catalog and in documentation new ad7aa0f Deprecate camel-quarkus-spark #3466 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: docs/modules/ROOT/examples/components/spark.yml | 2 +- docs/modules/ROOT/pages/reference/extensions/spark.adoc | 6 +++--- extensions-jvm/spark/runtime/pom.xml | 1 + .../runtime/src/main/resources/META-INF/quarkus-extension.yaml | 1 + .../org/apache/camel/quarkus/maven/CamelQuarkusExtension.java| 9 + .../src/main/java/org/apache/camel/quarkus/maven/CqUtils.java| 4 ++-- .../apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java| 2 +- .../apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java | 2 +- 8 files changed, 19 insertions(+), 8 deletions(-)
[GitHub] [camel-quarkus] ppalaga merged pull request #3544: Deprecate camel-quarkus-spark
ppalaga merged pull request #3544: URL: https://github.com/apache/camel-quarkus/pull/3544 -- 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] catshout edited a comment on issue #3003: Operator creates to many repositories
catshout edited a comment on issue #3003: URL: https://github.com/apache/camel-k/issues/3003#issuecomment-1036534021 Hi @squakez I did just perform the following commands ``` kamel uninstall --all --global k delete ns camel-k k delete ns integration k create ns camel-k k create ns integration kcn integration k create secret generic kaniko-secret --from-file=/home/cas-dev-gke/kaniko-secret.json -n camel-k kamel install --build-publish-strategy=Kaniko --registry gcr.io --organization cas-dev-gke --registry-secret kaniko-secret --global --force -n camel-k kamel run hello.groovy ``` The current namespace is `integration`. See ``` k config get-contexts * gke_cas-dev-gke_europe-west3-a_cas-dev-cluster-1 gke_cas-dev-gke_europe-west3-a_cas-dev-cluster-1 gke_cas-dev-gke_europe-west3-a_cas-dev-cluster-1 integration ``` Further I checked the Integration Kit and the Integration ``` k get integration -A NAMESPACE NAMEPHASE KITREPLICAS integration hello Running kit-c83ac3s8es090jfq3rig 1 k get integrationkit -A NAMESPACE NAME PHASE TYPE IMAGE camel-k kit-c83ac3s8es090jfq3rig Ready platform gcr.io/cas-dev-gke/camel-k-kit-c83ac3s8es090jfq3rig:209947 ``` So the Integration Kit was being created in the namespace `camel-k`, the integration in the namespace `integration`. Do you have any suggestions what might be wrong here? -- 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] catshout commented on issue #3003: Operator creates to many repositories
catshout commented on issue #3003: URL: https://github.com/apache/camel-k/issues/3003#issuecomment-1036534021 Hi @squakez I did just perform the following commands `kamel uninstall --all --global k delete ns camel-k k delete ns integration k create ns camel-k k create ns integration kcn integration k create secret generic kaniko-secret --from-file=/home/cas-dev-gke/kaniko-secret.json -n camel-k kamel install --build-publish-strategy=Kaniko --registry gcr.io --organization cas-dev-gke --registry-secret kaniko-secret --global --force -n camel-k kamel run hello.groovy` The current namespace is `integration`. See `k config get-contexts * gke_cas-dev-gke_europe-west3-a_cas-dev-cluster-1 gke_cas-dev-gke_europe-west3-a_cas-dev-cluster-1 gke_cas-dev-gke_europe-west3-a_cas-dev-cluster-1 integration` Further I checked the Integration Kit and the Integration `k get integration -A NAMESPACE NAMEPHASE KITREPLICAS integration hello Running kit-c83ac3s8es090jfq3rig 1 k get integrationkit -A NAMESPACE NAME PHASE TYPE IMAGE camel-k kit-c83ac3s8es090jfq3rig Ready platform gcr.io/cas-dev-gke/camel-k-kit-c83ac3s8es090jfq3rig:209947` So the Integration Kit was being created in the namespace `camel-k`, the integration in the namespace `integration`. Do you have any suggestions what might be wrong here? -- 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 (5bf4ffa -> 0059815)
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 5bf4ffa (chores) ci: added missing command for automated PR analysis with SonarQube add 0059815 (chores) ci: use recommended option for improving report time No new revisions were added by this update. Summary of changes: .github/workflows/master-pr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel] branch main updated (5bf4ffa -> 0059815)
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 5bf4ffa (chores) ci: added missing command for automated PR analysis with SonarQube add 0059815 (chores) ci: use recommended option for improving report time No new revisions were added by this update. Summary of changes: .github/workflows/master-pr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel-quarkus] branch main updated (e72113e -> 242bae0)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. from e72113e Poll for optaplanner results to avoid timeouts on slow machines add 242bae0 Remove duplicate software.amazon.awssdk:iam dependency declaration No new revisions were added by this update. Summary of changes: integration-tests/aws2-grouped/pom.xml | 5 - 1 file changed, 5 deletions(-)
[GitHub] [camel-quarkus] jamesnetherton merged pull request #3543: Remove duplicate software.amazon.awssdk:iam dependency declaration
jamesnetherton merged pull request #3543: URL: https://github.com/apache/camel-quarkus/pull/3543 -- 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 (64a18af -> e72113e)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. from 64a18af DebeziumMongodbTest skipped tests #3213 add e72113e Poll for optaplanner results to avoid timeouts on slow machines No new revisions were added by this update. Summary of changes: integration-tests/optaplanner/pom.xml | 12 ++- .../optaplanner/it/OptaplannerResource.java| 85 +-- .../quarkus/component/optaplanner/it/Routes.java | 15 ++-- .../component/optaplanner/it/OptaplannerTest.java | 98 ++ 4 files changed, 159 insertions(+), 51 deletions(-)
[GitHub] [camel-quarkus] jamesnetherton merged pull request #3542: Poll for optaplanner results to avoid timeouts on slow machines
jamesnetherton merged pull request #3542: URL: https://github.com/apache/camel-quarkus/pull/3542 -- 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] aldettinger commented on pull request #3505: Patch 2
aldettinger commented on pull request #3505: URL: https://github.com/apache/camel-quarkus/pull/3505#issuecomment-1036399271 @erayerdem Many thanks for contributions. The freemarker configuration [comes from quarkus-freemarker](https://github.com/apache/camel-quarkus/blob/main/extensions/freemarker/runtime/src/main/doc/configuration.adoc#quarkiverse-freemarker-and-its-configuration). As such, one should use the `quarkus.freemarker.includes` property to include the templates as shown in [integration tests](https://github.com/apache/camel-quarkus/blob/main/integration-tests/freemarker/src/main/resources/application.properties). So, the section dealing with including native resources in camel-quarkus-freemarker documentation may not be needed anymore. quarkus-freemarker [is embedding all templates in the native executable](https://github.com/quarkiverse/quarkus-freemarker/blob/master/deployment/src/main/java/io/quarkiverse/freemarker/deployment/FreemarkerProcessor.java#L106). That said, are you ok with closing this PR in favor of #3545 ? -- 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] aldettinger opened a new pull request #3545: Remove freemarker inaccurate documentation
aldettinger opened a new pull request #3545: URL: https://github.com/apache/camel-quarkus/pull/3545 -- 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] 01/01: [CAMEL-17618]follow up fix and re-enable failure test
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch CAMEL-17618-2
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 121ae617019f5dc53eea57479d05f84d1eafc7fc
Author: Freeman Fang
AuthorDate: Fri Feb 11 11:24:51 2022 -0500
[CAMEL-17618]follow up fix and re-enable failure test
---
.../org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java | 2 --
.../src/main/java/org/apache/camel/component/ref/RefEndpoint.java | 3 ++-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
index e2a85af..27e3749 100644
---
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
@@ -26,7 +26,6 @@ import org.apache.camel.util.IOHelper;
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.NoSuchCodeLitFault;
import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -66,7 +65,6 @@ public abstract class AbstractCXFGreeterRouterTest extends
CamelSpringTestSuppor
}
@Test
-@Disabled
public void testInvokingServiceFromCXFClient() throws Exception {
Service service = Service.create(serviceName);
service.addPort(routerPortName, "http://schemas.xmlsoap.org/soap/;,
diff --git
a/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
b/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
index caef53d8..07f8859 100644
---
a/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
+++
b/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
@@ -77,7 +77,8 @@ public class RefEndpoint extends DefaultEndpoint implements
DelegateEndpoint {
if (endpoint == null) {
// endpoint is mandatory
endpoint = CamelContextHelper.mandatoryLookup(getCamelContext(),
name, Endpoint.class);
-if (getCamelContext().getEndpoint(getEndpoint().getEndpointUri())
== null) {
+if (getCamelContext().getEndpoint(getEndpoint().getEndpointUri())
== null
+||
getCamelContext().getEndpoint(getEndpoint().getEndpointUri()) != endpoint) {
getCamelContext().addEndpoint(getEndpoint().getEndpointUri(),
endpoint);
}
}
[camel] branch CAMEL-17618-2 created (now 121ae61)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a change to branch CAMEL-17618-2 in repository https://gitbox.apache.org/repos/asf/camel.git. at 121ae61 [CAMEL-17618]follow up fix and re-enable failure test This branch includes the following new commits: new 121ae61 [CAMEL-17618]follow up fix and re-enable failure test 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.
[GitHub] [camel] ffang opened a new pull request #6938: [CAMEL-17618]follow up fix and re-enable failure test
ffang opened a new pull request #6938: URL: https://github.com/apache/camel/pull/6938 -- 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] ppalaga commented on issue #3466: Remove camel-quarkus-spark
ppalaga commented on issue #3466: URL: https://github.com/apache/camel-quarkus/issues/3466#issuecomment-1036378470 Deprecation PR https://github.com/apache/camel-quarkus/pull/3544 -- 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-karavan] oscerd commented on issue #185: Upgrade to kamelets 0.7.1
oscerd commented on issue #185: URL: https://github.com/apache/camel-karavan/issues/185#issuecomment-1036367142 Still to be released. It's just in staging repository now -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] mgubaidullin commented on issue #185: Upgrade to kamelets 0.7.1
mgubaidullin commented on issue #185: URL: https://github.com/apache/camel-karavan/issues/185#issuecomment-1036362044 Could not find artifact org.apache.camel.kamelets:camel-kamelets-catalog:jar:0.7.1 in central -- 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-karavan] mgubaidullin merged pull request #186: Select bean component
mgubaidullin merged pull request #186: URL: https://github.com/apache/camel-karavan/pull/186 -- 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-karavan] branch main updated: Select bean component (#186)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 9eca7d1 Select bean component (#186)
9eca7d1 is described below
commit 9eca7d1b1a4082aec7206cabcf7f70fddbfc14cf
Author: Marat Gubaidullin
AuthorDate: Fri Feb 11 10:57:47 2022 -0500
Select bean component (#186)
* Beans in Component configuration
* Basic bean config for components
---
karavan-core/src/core/api/ComponentApi.ts | 3 +-
karavan-demo/integrations/docker-compose.yml | 118 +++---
karavan-demo/integrations/sql-to-kafka.yaml| 19 +++
karavan-demo/integrations/sql-to-log.yaml | 27
karavan-demo/integrations/timer-yaml.yaml | 11 --
karavan-designer/public/components/sql.json| 2 +-
.../kamelets/insert-field-action.kamelet.yaml | 12 +-
karavan-designer/src/App.tsx | 6 +-
.../src/designer/field/ComponentParameterField.tsx | 120 --
.../src/designer/route/DslProperties.tsx | 4 +-
.../route/property/ComponentParameterField.tsx | 173 +
.../{field => route/property}/DataFormatField.tsx | 2 +-
.../{field => route/property}/DslPropertyField.tsx | 6 +-
.../{field => route/property}/ExpressionField.tsx | 4 +-
.../property}/KameletPropertyField.tsx | 2 +-
.../{field => route/property}/ObjectField.tsx | 2 +-
16 files changed, 300 insertions(+), 211 deletions(-)
diff --git a/karavan-core/src/core/api/ComponentApi.ts
b/karavan-core/src/core/api/ComponentApi.ts
index 347ddd1..f598d5a 100644
--- a/karavan-core/src/core/api/ComponentApi.ts
+++ b/karavan-core/src/core/api/ComponentApi.ts
@@ -174,8 +174,7 @@ export const ComponentApi = {
prop.enum = value.enum;
prop.kind = value.kind;
if (value.defaultValue) prop.defaultValue =
value.defaultValue
-if (!value.deprecated && value.type !== 'object')
properties.push(prop);
-if (!value.deprecated && value.type === 'object' &&
value.enum) properties.push(prop);
+if (!value.deprecated) properties.push(prop);
})
}
} finally {
diff --git a/karavan-demo/integrations/docker-compose.yml
b/karavan-demo/integrations/docker-compose.yml
index 24e861a..4693a45 100644
--- a/karavan-demo/integrations/docker-compose.yml
+++ b/karavan-demo/integrations/docker-compose.yml
@@ -2,57 +2,57 @@
version: '3.8'
services:
- mongo:
-image: mongo
-restart: always
-ports:
- - 27017:27017
-environment:
- MONGO_INITDB_ROOT_USERNAME: root
- MONGO_INITDB_ROOT_PASSWORD: example
-networks:
- - karavan-demo
+ # mongo:
+ # image: mongo
+ # restart: always
+ # ports:
+ # - 27017:27017
+ # environment:
+ # MONGO_INITDB_ROOT_USERNAME: root
+ # MONGO_INITDB_ROOT_PASSWORD: example
+ # networks:
+ # - karavan-demo
- zookeeper:
-container_name: zookeeper
-image: confluentinc/cp-zookeeper:latest
-ports:
- - "2181:2181"
-environment:
- ZOOKEEPER_CLIENT_PORT: 2181
- ZOOKEEPER_TICK_TIME: 2000
-networks:
- - karavan-demo
+ # zookeeper:
+ # container_name: zookeeper
+ # image: confluentinc/cp-zookeeper:latest
+ # ports:
+ # - "2181:2181"
+ # environment:
+ # ZOOKEEPER_CLIENT_PORT: 2181
+ # ZOOKEEPER_TICK_TIME: 2000
+ # networks:
+ # - karavan-demo
- kafka:
-container_name: kafka
-image: confluentinc/cp-kafka:latest
-depends_on:
- - zookeeper
-ports:
- - "9092:9092"
-environment:
- KAFKA_BROKER_ID: 1
- KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
- KAFKA_ADVERTISED_LISTENERS:
PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092
- KAFKA_LISTENER_SECURITY_PROTOCOL_MAP:
PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
- KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
- KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
- KAFKA_CREATE_TOPICS: "events:1:1"
-networks:
- - karavan-demo
+ # kafka:
+ # container_name: kafka
+ # image: confluentinc/cp-kafka:latest
+ # depends_on:
+ # - zookeeper
+ # ports:
+ # - "9092:9092"
+ # environment:
+ # KAFKA_BROKER_ID: 1
+ # KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+ # KAFKA_ADVERTISED_LISTENERS:
PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092
+ # KAFKA_LISTENER_SECURITY_PROTOCOL_MAP:
PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
+ # KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+ # KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+ # KAFKA_CREATE_TOPICS: "events:1:1"
+ # networks:
+ # - karavan-demo
- activemq:
-image: registry.redhat.io/amq7/amq-broker:latest
-
[GitHub] [camel-quarkus] ppalaga opened a new pull request #3544: Deprecate camel-quarkus-spark
ppalaga opened a new pull request #3544: URL: https://github.com/apache/camel-quarkus/pull/3544 Related #3466 -- 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] essobedo opened a new pull request #6937: Use Maven daemon for the build pipeline
essobedo opened a new pull request #6937: URL: https://github.com/apache/camel/pull/6937 ## Motivation The build allowing to validate a PR takes more than one hour, it could be interesting to speed it up. ## Modifications * Add a custom github action to install `mvnd` on the runner * Modify the maven commands to use `mvnd` instead * Set the total amount of threads to use to 2 corresponding to the total amount of cores on the runner ## Result According to my first test, it takes 42 minutes so about 20 minutes have been saved thanks to `mvnd` -- 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] zbendhiba commented on issue #3466: Remove camel-quarkus-spark
zbendhiba commented on issue #3466: URL: https://github.com/apache/camel-quarkus/issues/3466#issuecomment-1036346790 +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-quarkus] ppalaga commented on issue #1898: Figure out how to maintain Camel components that bring too old or too many non-convergent dependencies
ppalaga commented on issue #1898: URL: https://github.com/apache/camel-quarkus/issues/1898#issuecomment-1036343963 We gave up on Spark https://github.com/apache/camel-quarkus/issues/3466 -- 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] zbendhiba commented on pull request #3542: Poll for optaplanner results to avoid timeouts on slow machines
zbendhiba commented on pull request #3542: URL: https://github.com/apache/camel-quarkus/pull/3542#issuecomment-1036343298 Nice -- 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] ppalaga closed issue #1955: spark:dataframe does not work on Java 11
ppalaga closed issue #1955: URL: https://github.com/apache/camel-quarkus/issues/1955 -- 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] ppalaga commented on issue #1955: spark:dataframe does not work on Java 11
ppalaga commented on issue #1955: URL: https://github.com/apache/camel-quarkus/issues/1955#issuecomment-1036342683 Won't fix, because we plan to remove the existing JVM-only Spark extension https://github.com/apache/camel-quarkus/issues/3466 -- 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] ppalaga closed issue #1956: spark:hive is does not work
ppalaga closed issue #1956: URL: https://github.com/apache/camel-quarkus/issues/1956 -- 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] ppalaga commented on issue #1956: spark:hive is does not work
ppalaga commented on issue #1956: URL: https://github.com/apache/camel-quarkus/issues/1956#issuecomment-1036341994 Won't fix, because we plan to remove the existing JVM-only Spark extension https://github.com/apache/camel-quarkus/issues/3466 -- 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] ppalaga commented on issue #1701: [Dependency hell] Spark native support
ppalaga commented on issue #1701: URL: https://github.com/apache/camel-quarkus/issues/1701#issuecomment-1036336693 We will remove the existing JVM-only Spark extension https://github.com/apache/camel-quarkus/issues/3466 -- 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] ppalaga closed issue #1701: [Dependency hell] Spark native support
ppalaga closed issue #1701: URL: https://github.com/apache/camel-quarkus/issues/1701 -- 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 edited a comment on issue #3003: Operator creates to many repositories
squakez edited a comment on issue #3003: URL: https://github.com/apache/camel-k/issues/3003#issuecomment-1036317746 The `IntegrationKit`s are created in the same namespace where the `Integration` is executed. About point 2, there could be side effects if you have some other integration that is using such IntegrationKit. Make sure to delete only those Kits that have no Integration attached (ie, the interim ones that are coming from incremental tests you may have done on an Integration). The IntegrationKit won't be recreated, unless some new Integration with the same requirements will need to do so. -- 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 issue #3003: Operator creates to many repositories
squakez commented on issue #3003: URL: https://github.com/apache/camel-k/issues/3003#issuecomment-1036317746 The `IntegrationKit`s are created in the same namespace where the `Integration` is executed. About point 2, there could be side effects if you delete some other integration that is using such IntegrationKit. Make sure to delete only those Kits that have no Integration attached (ie, the interim ones that are coming from incremental tests you may have done on an Integration). The IntegrationKit won't be recreated, unless some new Integration with the same requirements will need to do so. -- 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 a change in pull request #3008: fix(build): incremental build
squakez commented on a change in pull request #3008:
URL: https://github.com/apache/camel-k/pull/3008#discussion_r804736957
##
File path: pkg/builder/image.go
##
@@ -120,7 +120,7 @@ func jvmDockerfile(ctx *builderContext) error {
}
func incrementalImageContext(ctx *builderContext) error {
- if ctx.Build.BaseImage != "" {
+ if ctx.Build.BaseImage != "" && ctx.Build.BaseImage !=
defaults.BaseImage() {
Review comment:
True. I fail to understand this check meaning then and how it worked
before the last refactoring. The `ctx.Build.BaseImage` will always be `!= ""`
because, at minimum it is filled with the default base image, reason why it is
not working. Any help appreciated :)
--
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 (c2ac4c4 -> 5bf4ffa)
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 c2ac4c4 CAMEL-17630: camel-microprofile - Update to newer releases add ad0be74b (chores) ci: experimental support for automated PR analysis with SonarCloud add d4fc4cc (chores) camel-maven-package-plugin: use final variables and fields when possible add b0bc076 (chores) camel-maven-package-plugin: consolidate duplicated logic add eff3488 (chores) camel-maven-package-plugin: removed redundant calls to toString() add 69ac29d (chores) camel-maven-package-plugin: consolidate duplicated logic add d886a86 (chores) camel-maven-package-plugin: use more performant methods when possible add 9b1b907 (chores) camel-maven-package-plugin: use modern Java language features when possible add 0ca0bd4 (chores) camel-maven-package-plugin: removed unused and/or dead code add 6be8e98 (chores) camel-maven-package-plugin: consolidate duplicated logic add 3337bf4 (chores) camel-maven-package-plugin: remove unused and/or dead code add 6a832a0 (chores) fixed formatting issue add 5bf4ffa (chores) ci: added missing command for automated PR analysis with SonarQube No new revisions were added by this update. Summary of changes: .github/workflows/master-pr-build.yml | 9 +- .../packaging/AbstractGenerateConfigurerMojo.java | 9 +- .../maven/packaging/AbstractGenerateMojo.java | 26 ++--- .../maven/packaging/AbstractGeneratorMojo.java | 2 +- .../camel/maven/packaging/EndpointDslMojo.java | 19 +--- .../packaging/EndpointSchemaGeneratorMojo.java | 9 +- .../packaging/EndpointUriFactoryGenerator.java | 4 +- .../apache/camel/maven/packaging/MvelHelper.java | 3 +- .../packaging/PackageArchetypeCatalogMojo.java | 12 +-- .../maven/packaging/PackageDataFormatMojo.java | 6 +- .../camel/maven/packaging/PrepareAssemblyMojo.java | 6 +- .../camel/maven/packaging/PrepareCatalogMojo.java | 7 +- .../camel/maven/packaging/PrepareExampleMojo.java | 3 +- .../maven/packaging/PrepareParentPomMojo.java | 4 +- .../packaging/PropertyConfigurerGenerator.java | 4 +- .../camel/maven/packaging/SchemaGeneratorMojo.java | 2 +- .../camel/maven/packaging/UpdateReadmeMojo.java| 6 +- .../camel/maven/packaging/XRefCheckMojo.java | 4 +- .../camel/maven/packaging/dsl/DslHelper.java | 70 - .../ComponentDslBuilderFactoryGenerator.java | 2 +- .../ComponentDslInnerImplBuilderGenerator.java | 2 +- .../ComponentsBuilderFactoryGenerator.java | 2 +- .../component/ComponentsDslMetadataRegistry.java | 6 +- .../camel/maven/packaging/generics/ClassUtil.java | 2 +- .../maven/packaging/generics/GenericsUtil.java | 113 - .../generics/OwbGenericArrayTypeImpl.java | 2 +- .../packaging/generics/OwbTypeVariableImpl.java| 11 +- .../packaging/generics/OwbWildcardTypeImpl.java| 4 +- 28 files changed, 90 insertions(+), 259 deletions(-)
[GitHub] [camel] orpiske commented on a change in pull request #6936: CAMEL-17564: Added authSource param to MongoDB connection endpoint
orpiske commented on a change in pull request #6936:
URL: https://github.com/apache/camel/pull/6936#discussion_r804716091
##
File path:
components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbCredentialsFromUriConnectionIT.java
##
@@ -41,6 +50,22 @@ protected CamelContext createCamelContext() throws Exception
{
return ctx;
}
+@Test
+public void testCountOperationAuthUser() {
+// Test that the collection has 0 documents in it
+assertEquals(0, testCollection.countDocuments());
+Object result = template.requestBody("direct:testAuthSource",
"irrelevantBody");
+assertTrue(result instanceof Long, "Result is not of type Long");
Review comment:
I think you can use `assertInstanceOf` for greater readability.
--
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] catshout commented on issue #3003: Operator creates to many repositories
catshout commented on issue #3003: URL: https://github.com/apache/camel-k/issues/3003#issuecomment-1036269114 @squakez I was wrong with point 3, the Integration Kit was the one for my test Integration. Are there standards in which namespaces the Integration Kits are coming up? What's about point 2? And here, when I'm going to delete the repository, will this be re-created? Best Gerald -- 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/02: Upgrade Camel to 3.16.0
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 195f7a80dbf91c7b9a0eeb6cd4045a7395e1f3b3
Author: James Netherton
AuthorDate: Wed Feb 9 11:13:37 2022 +
Upgrade Camel to 3.16.0
---
docs/antora.yml| 6 +-
.../ROOT/pages/reference/extensions/yaml-dsl.adoc | 6 --
.../it/health/CustomHealthCheckRepository.java | 17 --
.../microprofile/it/health/FailingHealthCheck.java | 2 +-
.../it/health/FailureThresholdHealthCheck.java | 51
.../it/health/MicroProfileHealthResource.java | 17 +-
.../src/main/resources/application.properties | 7 +--
.../it/health/MicroProfileHealthTest.java | 67 --
pom.xml| 6 +-
9 files changed, 9 insertions(+), 170 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 1413755..0d85853 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -29,11 +29,11 @@ asciidoc:
min-maven-version: 3.8.1 # replace ${min-maven-version}
target-maven-version: 3.8.4 # replace ${target-maven-version}
-camel-version: 3.15.0 # replace ${camel.version}
-camel-docs-version: 3.15.x # replace ${camel.docs.components.version}
+camel-version: 3.16.0-SNAPSHOT # replace ${camel.version}
+camel-docs-version: 3.16.x # replace ${camel.docs.components.version}
quarkus-version: 2.7.1.Final # replace ${quarkus.version}
graalvm-version: 21.3.1 # replace ${graalvm.version}
graalvm-docs-version: 21.3
# attributes used in xrefs to other Antora components
-cq-camel-components: 3.15.x@components # replace
${camel.docs.components.xref}
+cq-camel-components: 3.16.x@components # replace
${camel.docs.components.xref}
quarkus-examples-version: latest
diff --git a/docs/modules/ROOT/pages/reference/extensions/yaml-dsl.adoc
b/docs/modules/ROOT/pages/reference/extensions/yaml-dsl.adoc
index bdde5d3..26484a9 100644
--- a/docs/modules/ROOT/pages/reference/extensions/yaml-dsl.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/yaml-dsl.adoc
@@ -16,12 +16,6 @@
An YAML stack for parsing YAML route definitions
-== What's inside
-
-* xref:{cq-camel-components}:others:yaml-dsl.adoc[YAML DSL]
-
-Please refer to the above link for usage and configuration details.
-
== Maven coordinates
https://code.quarkus.io/?extension-search=camel-quarkus-yaml-dsl[Create a new
project with this extension on code.quarkus.io, window="_blank"]
diff --git
a/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/CustomHealthCheckRepository.java
b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/CustomHealthCheckRepository.java
index c54665d..2d31330 100644
---
a/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/CustomHealthCheckRepository.java
+++
b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/CustomHealthCheckRepository.java
@@ -16,12 +16,10 @@
*/
package org.apache.camel.quarkus.component.microprofile.it.health;
-import java.util.Collections;
import java.util.Map;
import java.util.stream.Stream;
import org.apache.camel.health.HealthCheck;
-import org.apache.camel.health.HealthCheckConfiguration;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.health.HealthCheckResultBuilder;
import org.apache.camel.impl.health.AbstractHealthCheck;
@@ -44,21 +42,6 @@ public class CustomHealthCheckRepository implements
HealthCheckRepository {
}
@Override
-public void setConfigurations(Map
configurations) {
-// Noop
-}
-
-@Override
-public Map getConfigurations() {
-return Collections.emptyMap();
-}
-
-@Override
-public void addConfiguration(String id, HealthCheckConfiguration
configuration) {
-// Noop
-}
-
-@Override
public Stream stream() {
return Stream.of(check);
}
diff --git
a/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/FailingHealthCheck.java
b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/FailingHealthCheck.java
index 2d56d54..b278052 100644
---
a/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/FailingHealthCheck.java
+++
b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/FailingHealthCheck.java
@@ -25,7 +25,7 @@ public class FailingHealthCheck extends AbstractHealthCheck {
public FailingHealthCheck() {
super("failing-check");
-getConfiguration().setEnabled(false);
+
[camel-quarkus] branch camel-main updated (72afb8b -> f7e29e6)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard 72afb8b Upgrade Camel to 3.16.0
add 891a863 Updated CHANGELOG.md
add 64a18af DebeziumMongodbTest skipped tests #3213
new 195f7a8 Upgrade Camel to 3.16.0
new f7e29e6 Temporary hacks to handle version misalignment of
smallrye-health and smallrye-faulttolerance in Quarkus & Camel
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 (72afb8b)
\
N -- N -- N refs/heads/camel-main (f7e29e6)
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:
CHANGELOG.md | 2 +
.../MicroprofileFaultToleranceProcessor.java | 9 +
.../microprofile-fault-tolerance/runtime/pom.xml | 2 +
.../FaultToleranceConfiguration.java | 120 +
.../faulttolerance/FaultToleranceConstants.java} | 7 +-
.../faulttolerance/FaultToleranceProcessor.java| 536 +
.../FaultToleranceProcessorFactory.java| 22 +-
.../faulttolerance/FaultToleranceReifier.java | 193
.../apache/camel/model/CircuitBreakerDefinition| 3 +-
.../runtime/CamelMicroProfileHealthRecorder.java | 3 +-
...amelQuarkusMicroProfileHealthCheckRegistry.java | 46 ++
.../common/it/mongodb/DebeziumMongodbTest.java | 13 +-
.../common/it/mysql/DebeziumMysqlTest.java | 36 +-
.../common/it/sqlserver/DebeziumSqlserverTest.java | 33 +-
14 files changed, 939 insertions(+), 86 deletions(-)
create mode 100644
extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceConfiguration.java
copy
extensions/{aws2-lambda/runtime/src/main/org/apache/lambda/it/Aws2LambdaIT.java
=>
microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceConstants.java}
(80%)
create mode 100644
extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceProcessor.java
copy
extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledValidateReifier.java
=>
extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceProcessorFactory.java
(57%)
create mode 100644
extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceReifier.java
copy integration-tests-jvm/spark/src/main/resources/testrdd.txt =>
extensions/microprofile-fault-tolerance/runtime/src/main/resources/META-INF/services/org/apache/camel/model/CircuitBreakerDefinition
(89%)
create mode 100644
extensions/microprofile-health/runtime/src/main/java/org/apache/camel/quarkus/component/microprofile/health/runtime/CamelQuarkusMicroProfileHealthCheckRegistry.java
[camel-quarkus] 02/02: Temporary hacks to handle version misalignment of smallrye-health and smallrye-faulttolerance in Quarkus & Camel
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit f7e29e65e6e848bf0045385b168da31ed290a26c
Author: James Netherton
AuthorDate: Fri Feb 11 10:08:03 2022 +
Temporary hacks to handle version misalignment of smallrye-health and
smallrye-faulttolerance in Quarkus & Camel
---
.../MicroprofileFaultToleranceProcessor.java | 9 +
.../microprofile-fault-tolerance/runtime/pom.xml | 2 +
.../FaultToleranceConfiguration.java | 120 +
.../faulttolerance/FaultToleranceConstants.java} | 21 +-
.../faulttolerance/FaultToleranceProcessor.java| 536 +
.../FaultToleranceProcessorFactory.java} | 28 +-
.../faulttolerance/FaultToleranceReifier.java | 193
.../apache/camel/model/CircuitBreakerDefinition| 18 +
.../runtime/CamelMicroProfileHealthRecorder.java | 3 +-
...amelQuarkusMicroProfileHealthCheckRegistry.java | 46 ++
10 files changed, 942 insertions(+), 34 deletions(-)
diff --git
a/extensions/microprofile-fault-tolerance/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/fault/tolerance/deployment/MicroprofileFaultToleranceProcessor.java
b/extensions/microprofile-fault-tolerance/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/fault/tolerance/deployment/MicroprofileFaultToleranceProcessor.java
index 05673b1..6e8c382 100644
---
a/extensions/microprofile-fault-tolerance/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/fault/tolerance/deployment/MicroprofileFaultToleranceProcessor.java
+++
b/extensions/microprofile-fault-tolerance/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/fault/tolerance/deployment/MicroprofileFaultToleranceProcessor.java
@@ -16,9 +16,13 @@
*/
package
org.apache.camel.quarkus.component.microprofile.fault.tolerance.deployment;
+import java.nio.file.Paths;
+
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import
io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import
org.apache.camel.component.microprofile.faulttolerance.FaultToleranceProcessorFactory;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceBuildItem;
class MicroprofileFaultToleranceProcessor {
@@ -35,4 +39,9 @@ class MicroprofileFaultToleranceProcessor {
"META-INF/services/org/apache/camel/model/CircuitBreakerDefinition");
}
+@BuildStep
+CamelServiceBuildItem camelCronServicePattern() {
+return new
CamelServiceBuildItem(Paths.get("META-INF/services/org/apache/camel/model/CircuitBreakerDefinition"),
+FaultToleranceProcessorFactory.class.getName());
+}
}
diff --git a/extensions/microprofile-fault-tolerance/runtime/pom.xml
b/extensions/microprofile-fault-tolerance/runtime/pom.xml
index 3401f07..22e3962 100644
--- a/extensions/microprofile-fault-tolerance/runtime/pom.xml
+++ b/extensions/microprofile-fault-tolerance/runtime/pom.xml
@@ -56,10 +56,12 @@
org.apache.camel.quarkus
camel-quarkus-core
+
diff --git
a/extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceConfiguration.java
b/extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceConfiguration.java
new file mode 100644
index 000..7cb3d4d
--- /dev/null
+++
b/extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceConfiguration.java
@@ -0,0 +1,120 @@
+/*
+ * 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.microprofile.faulttolerance;
+
+public class FaultToleranceConfiguration {
+
+private long delay;
+private int successThreshold;
+private int requestVolumeThreshold;
+private float failureRatio;
+private boolean timeoutEnabled;
+private long timeoutDuration;
+
[GitHub] [camel] djcoleman opened a new pull request #6936: CAMEL-17564: Added authSource param to MongoDB connection endpoint
djcoleman opened a new pull request #6936: URL: https://github.com/apache/camel/pull/6936 The authSource parameter allows you to connect to a MongoDB database as a user whose credentials are stored in a database other than the default "admin". So if you have a user called test-user in registered in the test database, you can use the following endpoint: "mongodb:mongo?hosts=localhost:27017=test-user=testpwd=test&..." - [X] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. See CAMEL-17564 - [X] Each commit in the pull request should have a meaningful subject line and body. - [X] If you're unsure, you can format the pull request title like `[CAMEL-XXX] Fixes bug in camel-file component`, where you replace `CAMEL-XXX` with the appropriate JIRA issue. - [X] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [X] Run `mvn clean install -Psourcecheck` in your module with source check enabled to make sure basic checks pass and there are no checkstyle violations. A more thorough check will be performed on your pull request automatically. Below are the contribution guidelines: https://github.com/apache/camel/blob/main/CONTRIBUTING.md -- 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 opened a new pull request #6935: Last round of cleanups for the camel-maven-package-plugin
orpiske opened a new pull request #6935: URL: https://github.com/apache/camel/pull/6935 -- 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] essobedo commented on pull request #6929: CAMEL-17633: Support JUnit 5 for Camel CDI
essobedo commented on pull request #6929: URL: https://github.com/apache/camel/pull/6929#issuecomment-1036249114 Good catch, let me check it -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske opened a new pull request #6934: (chores) camel-bundle-plugin: a few minor cleanups
orpiske opened a new pull request #6934: URL: https://github.com/apache/camel/pull/6934 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: (chores) ci: added missing command for automated PR analysis with SonarQube
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 5bf4ffa (chores) ci: added missing command for automated PR analysis
with SonarQube
5bf4ffa is described below
commit 5bf4ffa44fb95c491cb00f7207784e2e6be0a617
Author: Otavio Rodolfo Piske
AuthorDate: Fri Feb 11 14:59:29 2022 +0100
(chores) ci: added missing command for automated PR analysis with SonarQube
---
.github/workflows/master-pr-build.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/master-pr-build.yml
b/.github/workflows/master-pr-build.yml
index 5e2800e..fd4216e 100644
--- a/.github/workflows/master-pr-build.yml
+++ b/.github/workflows/master-pr-build.yml
@@ -58,4 +58,4 @@ jobs:
env:
GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
SONAR_TOKEN: '${{ secrets.SONAR_TOKEN }}'
-run: ./mvnw -V -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120 --no-transfer-progress
-Pfastinstall -Dcheckstyle.skip=true -DskipTests install
+run: ./mvnw -V -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120 --no-transfer-progress
-Pfastinstall -Dcheckstyle.skip=true -DskipTests
-Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache
-Dsonar.projectKey=apache_camel install
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
[camel] branch main updated (3337bf4 -> 6a832a0)
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 3337bf4 (chores) camel-maven-package-plugin: remove unused and/or dead code add 6a832a0 (chores) fixed formatting issue No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/maven/packaging/generics/GenericsUtil.java | 1 - 1 file changed, 1 deletion(-)
[GitHub] [camel] apupier commented on pull request #6929: CAMEL-17633: Support JUnit 5 for Camel CDI
apupier commented on pull request #6929: URL: https://github.com/apache/camel/pull/6929#issuecomment-1036235991 it seems that this PR has broken the website: https://github.com/apache/camel-website/runs/5156646508?check_suite_focus=true#step:4:23 ``` ➤ YN: [13:38:34.632] ERROR (asciidoctor): target of xref not found: components:others:test-cdi-junit5.adoc ➤ YN: file: docs/user-manual/modules/ROOT/pages/testing.adoc ➤ YN: source: https://github.com/apache/camel.git (refname: main, start path: docs/user-manual) ``` any ideas how to fix it? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 07/09: (chores) camel-maven-package-plugin: removed unused and/or dead code
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
commit 0ca0bd4b5072e1f68aa70748f16ad8cb83a5e1e0
Author: Otavio Rodolfo Piske
AuthorDate: Fri Feb 11 11:56:40 2022 +0100
(chores) camel-maven-package-plugin: removed unused and/or dead code
---
.../camel/maven/packaging/dsl/DslHelper.java | 38 --
1 file changed, 38 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/DslHelper.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/DslHelper.java
index f67ff93..e68ccf9 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/DslHelper.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/DslHelper.java
@@ -30,11 +30,6 @@ public final class DslHelper {
private DslHelper() {
}
-public static List loadAllJavaFiles(final File dir, final String
targetJavaPackageName) {
-final File allComponentsDslEndpointFactory = new File(dir,
targetJavaPackageName.replace('.', '/'));
-return loadAllJavaFiles(allComponentsDslEndpointFactory);
-}
-
public static List loadAllJavaFiles(final File dir) {
final File[] files = dir.listFiles();
@@ -85,42 +80,9 @@ public final class DslHelper {
return desc;
}
-public static String getMainDescription(final ComponentModel
componentModel) {
-String desc = getMainDescriptionWithoutPathOptions(componentModel);
-// include javadoc for all path parameters and mark which are required
-desc += "\n";
-desc += "\nSyntax: " + componentModel.getSyntax() + "";
-
-for (ComponentModel.EndpointOptionModel option :
componentModel.getEndpointOptions()) {
-if ("path".equals(option.getKind())) {
-desc += "\n";
-desc += "\nPath parameter: " + option.getName();
-if (option.isRequired()) {
-desc += " (required)";
-}
-if (option.isDeprecated()) {
-desc += " deprecated";
-}
-desc += "\n" + option.getDescription();
-if (option.getDefaultValue() != null) {
-desc += "\nDefault value: " + option.getDefaultValue();
-}
-if (option.getEnums() != null && !option.getEnums().isEmpty())
{
-desc += "\nThere are " + option.getEnums().size() + "
enums and the value can be one of: "
-+ wrapEnumValues(option.getEnums());
-}
-}
-}
-return desc;
-}
public static String generateComponentBuilderClassName(final
ComponentModel componentModel, final String suffix) {
return
StringUtils.capitalize(toCamelCaseLower(componentModel.getScheme()))
+ "Component" + suffix;
}
-
-private static String wrapEnumValues(List enumValues) {
-// comma to space so we can wrap words (which uses space)
-return String.join(", ", enumValues);
-}
}
[camel] 04/09: (chores) camel-maven-package-plugin: consolidate duplicated logic
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
commit 69ac29dc23105a0f8203e223356c3781731a5862
Author: Otavio Rodolfo Piske
AuthorDate: Fri Feb 11 11:40:27 2022 +0100
(chores) camel-maven-package-plugin: consolidate duplicated logic
---
.../packaging/AbstractGenerateConfigurerMojo.java | 3 ---
.../maven/packaging/AbstractGenerateMojo.java | 11 ++--
.../camel/maven/packaging/EndpointDslMojo.java | 15 ++-
.../packaging/EndpointSchemaGeneratorMojo.java | 5 ++--
.../apache/camel/maven/packaging/MvelHelper.java | 1 -
.../camel/maven/packaging/PrepareCatalogMojo.java | 1 -
.../camel/maven/packaging/dsl/DslHelper.java | 31 +-
.../packaging/generics/OwbTypeVariableImpl.java| 2 --
8 files changed, 31 insertions(+), 38 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
index c0c8750..5ae9b2f 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
@@ -410,9 +410,6 @@ public abstract class AbstractGenerateConfigurerMojo
extends AbstractGeneratorMo
if ("setBindingMode".equals(setter.getName()) ||
"setHostNameResolver".equals(setter.getName())) {
// we only want the string setter
return setter.getParameterTypes()[0] == String.class;
-} else if ("setHostNameResolver".equals(setter.getName())) {
-// we only want the string setter
-return setter.getParameterTypes()[0] == String.class;
}
Metadata meta = setter.getAnnotation(Metadata.class);
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
index 0f9d995..3ec494f 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
@@ -104,10 +104,9 @@ public abstract class AbstractGenerateMojo extends
AbstractMojo {
private void writeIncrementalInfo(MavenProject project) throws
MojoExecutionException {
try {
Path cacheData = getIncrementalDataPath(project);
-String curdata = getIncrementalData();
Files.createDirectories(cacheData.getParent());
try (Writer w = Files.newBufferedWriter(cacheData)) {
-w.append(curdata);
+w.append(INCREMENTAL_DATA);
}
} catch (IOException e) {
throw new MojoExecutionException("Error checking manifest uptodate
status", e);
@@ -150,6 +149,14 @@ public abstract class AbstractGenerateMojo extends
AbstractMojo {
return false;
}
+private String getPreviousRunData(Path cacheData) throws IOException {
+if (Files.isRegularFile(cacheData)) {
+return new String(Files.readAllBytes(cacheData),
StandardCharsets.UTF_8);
+} else {
+return null;
+}
+}
+
private String getIncrementalData() {
return "";
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index 6721fb6..89b6728 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -32,6 +32,7 @@ import java.util.stream.Collectors;
import javax.annotation.Generated;
+import org.apache.camel.maven.packaging.dsl.DslHelper;
import org.apache.camel.tooling.model.BaseModel;
import org.apache.camel.tooling.model.ComponentModel;
import org.apache.camel.tooling.model.ComponentModel.EndpointOptionModel;
@@ -919,19 +920,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo
{
}
if (s != null) {
s = s.substring(0, 1).toLowerCase() + s.substring(1);
-switch (s) {
-case "class":
-s = "clas";
-break;
-case "package":
-s = "packag";
-break;
-case "rest":
-
[GitHub] [camel-k] astefanutti commented on a change in pull request #3008: fix(build): incremental build
astefanutti commented on a change in pull request #3008:
URL: https://github.com/apache/camel-k/pull/3008#discussion_r804668099
##
File path: pkg/builder/image.go
##
@@ -120,7 +120,7 @@ func jvmDockerfile(ctx *builderContext) error {
}
func incrementalImageContext(ctx *builderContext) error {
- if ctx.Build.BaseImage != "" {
+ if ctx.Build.BaseImage != "" && ctx.Build.BaseImage !=
defaults.BaseImage() {
Review comment:
I think it's still an issue when the base image set on the
IntegrationPlatform that's been used to initialise the Build base image is
different than `default.BaseImage`?
##
File path: pkg/builder/image.go
##
@@ -120,7 +120,7 @@ func jvmDockerfile(ctx *builderContext) error {
}
func incrementalImageContext(ctx *builderContext) error {
- if ctx.Build.BaseImage != "" {
+ if ctx.Build.BaseImage != "" && ctx.Build.BaseImage !=
defaults.BaseImage() {
Review comment:
I think it's still an issue when the base image set on the
IntegrationPlatform that's been used to initialise the Build base image is
different than `default.BaseImage()`?
--
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] 01/09: (chores) camel-maven-package-plugin: use final variables and fields when possible
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
commit d4fc4cc3798e7debd45b2ebe48f18c6669efbaae
Author: Otavio Rodolfo Piske
AuthorDate: Fri Feb 11 11:39:09 2022 +0100
(chores) camel-maven-package-plugin: use final variables and fields when
possible
---
.../java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java | 2 +-
.../dsl/component/ComponentDslBuilderFactoryGenerator.java | 2 +-
.../packaging/dsl/component/ComponentsBuilderFactoryGenerator.java | 2 +-
.../packaging/dsl/component/ComponentsDslMetadataRegistry.java | 6 +++---
.../camel/maven/packaging/generics/OwbGenericArrayTypeImpl.java | 2 +-
.../apache/camel/maven/packaging/generics/OwbTypeVariableImpl.java | 6 +++---
.../apache/camel/maven/packaging/generics/OwbWildcardTypeImpl.java | 4 ++--
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
index 3aa2f12..1c06890 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
@@ -198,7 +198,7 @@ public class PrepareCatalogMojo extends AbstractMojo {
private Collection allJsonFiles;
private Collection allPropertiesFiles;
-private Map> allModels = new HashMap<>();
+private final Map> allModels = new HashMap<>();
private static String asComponentName(Path file) {
String name = file.getFileName().toString();
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
index 4e58672..e377880 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
@@ -35,7 +35,7 @@ public final class ComponentDslBuilderFactoryGenerator {
private final ComponentModel componentModel;
private final String packageName;
-private JavaClass javaClass;
+private final JavaClass javaClass;
private ComponentDslInnerBuilderGenerator
componentDslInnerBuilderGenerator;
private ComponentDslInnerImplBuilderGenerator
componentDslInnerImplBuilderGenerator;
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGenerator.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGenerator.java
index e7df1ee..284e9b5 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGenerator.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGenerator.java
@@ -38,7 +38,7 @@ public final class ComponentsBuilderFactoryGenerator {
private final String packageName;
private final Set componentModels;
-private JavaClass javaClass;
+private final JavaClass javaClass;
private ComponentsBuilderFactoryGenerator(final Set
componentModels, final ClassLoader classLoader,
final String packageName) {
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsDslMetadataRegistry.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsDslMetadataRegistry.java
index ab73b57..7f9bc62 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsDslMetadataRegistry.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsDslMetadataRegistry.java
@@ -41,9 +41,9 @@ import static
org.apache.camel.tooling.util.PackageHelper.loadText;
*/
public class ComponentsDslMetadataRegistry {
-private Map componentsCache;
-private Set componentsDslFactories;
-private File metadataFile;
+private final Map componentsCache;
+private final Set componentsDslFactories;
+private final File metadataFile;
public ComponentsDslMetadataRegistry(final File componentDslDir,
[camel] 09/09: (chores) camel-maven-package-plugin: remove unused and/or dead code
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
commit 3337bf43ab961752a16ea5afe545e1c8bbdd804f
Author: Otavio Rodolfo Piske
AuthorDate: Fri Feb 11 12:52:26 2022 +0100
(chores) camel-maven-package-plugin: remove unused and/or dead code
---
.../maven/packaging/generics/GenericsUtil.java | 112 -
1 file changed, 112 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/GenericsUtil.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/GenericsUtil.java
index 7cc64e0..443634f 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/GenericsUtil.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/GenericsUtil.java
@@ -17,7 +17,6 @@
package org.apache.camel.maven.packaging.generics;
import java.lang.reflect.Array;
-import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.GenericArrayType;
import java.lang.reflect.GenericDeclaration;
@@ -43,55 +42,6 @@ public final class GenericsUtil {
private GenericsUtil() {
}
-public static boolean satisfiesDependency(
-boolean isDelegateOrEvent, boolean isProducer, Type
injectionPointType, Type beanType) {
-if (beanType instanceof TypeVariable || beanType instanceof
WildcardType || beanType instanceof GenericArrayType) {
-return isAssignableFrom(isDelegateOrEvent, isProducer,
injectionPointType, beanType);
-} else {
-Type injectionPointRawType = injectionPointType instanceof
ParameterizedType
-? ((ParameterizedType) injectionPointType).getRawType() :
injectionPointType;
-Type beanRawType = beanType instanceof ParameterizedType ?
((ParameterizedType) beanType).getRawType() : beanType;
-
-if (ClassUtil.isSame(injectionPointRawType, beanRawType)) {
-return isAssignableFrom(isDelegateOrEvent, isProducer,
injectionPointType, beanType);
-}
-}
-
-return false;
-}
-
-public static boolean satisfiesDependencyRaw(
-boolean isDelegateOrEvent, boolean isProducer, Type
injectionPointType, Type beanType) {
-if (beanType instanceof TypeVariable || beanType instanceof
WildcardType || beanType instanceof GenericArrayType) {
-return isAssignableFrom(isDelegateOrEvent, isProducer,
injectionPointType, beanType);
-} else {
-Type injectionPointRawType = injectionPointType instanceof
ParameterizedType
-? ((ParameterizedType) injectionPointType).getRawType() :
injectionPointType;
-Type beanRawType = beanType instanceof ParameterizedType ?
((ParameterizedType) beanType).getRawType() : beanType;
-
-if (ClassUtil.isSame(injectionPointRawType, beanRawType)) {
-return isAssignableFrom(isDelegateOrEvent, isProducer,
injectionPointRawType, beanRawType);
-} else {
-Class bean = (Class) beanType;
-if (bean.getSuperclass() != null &&
ClassUtil.isRawClassEquals(injectionPointType, bean.getSuperclass())) {
-return true;
-}
-
-Class[] interfaces = bean.getInterfaces();
-if (interfaces == null || interfaces.length == 0) {
-return false;
-}
-
-for (Class clazz : interfaces) {
-if (ClassUtil.isRawClassEquals(injectionPointType, clazz))
{
-return true;
-}
-}
-}
-}
-
-return false;
-}
/**
* 5.2.3 and 5.2.4
@@ -402,10 +352,6 @@ public final class GenericsUtil {
}
-public static boolean containTypeVariable(Collection
types) {
-return containTypeVariable(types.toArray(new Type[types.size()]));
-}
-
public static boolean containTypeVariable(Type[] types) {
for (Type type : types) {
if (containsTypeVariable(type)) {
@@ -416,30 +362,6 @@ public final class GenericsUtil {
}
/**
- * @param type to check
- * @return {@code true} if the given type contains a {@link
WildcardType} {@code false} otherwise
- */
-public static boolean containsWildcardType(Type type) {
-if (!(type instanceof ParameterizedType)) {
-return false;
-}
-
-for (Type typeArgument :
getParameterizedType(type).getActualTypeArguments()) {
-if (ClassUtil.isParameterizedType(typeArgument)) {
-if (containsWildcardType(typeArgument)) {
-return true;
-}
-} else {
-
[camel] 06/09: (chores) camel-maven-package-plugin: use modern Java language features when possible
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
commit 9b1b907f2bc055b14891620d9a77dd40a3817737
Author: Otavio Rodolfo Piske
AuthorDate: Fri Feb 11 11:54:56 2022 +0100
(chores) camel-maven-package-plugin: use modern Java language features when
possible
---
.../maven/packaging/AbstractGenerateConfigurerMojo.java | 4 +---
.../apache/camel/maven/packaging/AbstractGeneratorMojo.java | 2 +-
.../org/apache/camel/maven/packaging/EndpointDslMojo.java| 2 +-
.../camel/maven/packaging/EndpointSchemaGeneratorMojo.java | 2 +-
.../camel/maven/packaging/PackageArchetypeCatalogMojo.java | 12 +++-
.../java/org/apache/camel/maven/packaging/XRefCheckMojo.java | 2 +-
.../org/apache/camel/maven/packaging/generics/ClassUtil.java | 2 +-
7 files changed, 9 insertions(+), 17 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
index 5ae9b2f..c2ff0bb 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
@@ -284,9 +284,7 @@ public abstract class AbstractGenerateConfigurerMojo
extends AbstractGeneratorMo
private Collection getAllDependencies() throws
MojoExecutionException {
List artifacts = new ArrayList<>();
-for (Iterator dependencies = project.getDependencies().iterator();
dependencies.hasNext();) {
-Dependency dependency = (Dependency) dependencies.next();
-
+for (Dependency dependency : project.getDependencies()) {
String groupId = dependency.getGroupId();
String artifactId = dependency.getArtifactId();
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGeneratorMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGeneratorMojo.java
index 3b10f3b..457ecef 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGeneratorMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGeneratorMojo.java
@@ -151,7 +151,7 @@ public abstract class AbstractGeneratorMojo extends
AbstractMojo {
}
protected static Supplier cache(Supplier supplier) {
-return new Supplier() {
+return new Supplier<>() {
T value;
@Override
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index 893e17b..9b4cc10 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -846,7 +846,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
javaClass.addAnnotation(Generated.class).setStringValue("value",
EndpointDslMojo.class.getName());
// sort methods
-Collections.sort(methods, (m1, m2) ->
m1.getName().compareToIgnoreCase(m2.getName()));
+methods.sort((m1, m2) ->
m1.getName().compareToIgnoreCase(m2.getName()));
// create method
for (Method method : methods) {
javaClass.addMethod(method);
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
index 8148c65..bcfd78c 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
@@ -151,7 +151,7 @@ public class EndpointSchemaGeneratorMojo extends
AbstractGeneratorMojo {
}
}
// make sure we sort the classes in case one inherit from the other
-classes.sort((c1, c2) -> compareClasses(c1, c2));
+classes.sort(this::compareClasses);
Map models = new HashMap<>();
for (Class classElement : classes) {
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageArchetypeCatalogMojo.java
[camel] 08/09: (chores) camel-maven-package-plugin: consolidate duplicated logic
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
commit 6be8e9843e5dc42e5b6b8ca2ac83e40fccbd084e
Author: Otavio Rodolfo Piske
AuthorDate: Fri Feb 11 12:10:17 2022 +0100
(chores) camel-maven-package-plugin: consolidate duplicated logic
---
.../java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java | 2 +-
.../src/main/java/org/apache/camel/maven/packaging/dsl/DslHelper.java | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
index 3ec494f..4dbe09c 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
@@ -117,7 +117,7 @@ public abstract class AbstractGenerateMojo extends
AbstractMojo {
try {
Path cacheData = getIncrementalDataPath(project);
final String prvdata = getPreviousRunData(cacheData);
-if (prvdata.isEmpty()) {
+if (INCREMENTAL_DATA.equals(prvdata)) {
long lastmod = Files.getLastModifiedTime(cacheData).toMillis();
Set stale = Stream.concat(Stream.concat(
project.getCompileSourceRoots().stream().map(File::new),
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/DslHelper.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/DslHelper.java
index e68ccf9..5c10174 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/DslHelper.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/DslHelper.java
@@ -80,7 +80,6 @@ public final class DslHelper {
return desc;
}
-
public static String generateComponentBuilderClassName(final
ComponentModel componentModel, final String suffix) {
return
StringUtils.capitalize(toCamelCaseLower(componentModel.getScheme()))
+ "Component" + suffix;
[camel] 05/09: (chores) camel-maven-package-plugin: use more performant methods when possible
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
commit d886a866ca2df80c4423fbe5516dd90b2d2ca2dc
Author: Otavio Rodolfo Piske
AuthorDate: Fri Feb 11 11:54:45 2022 +0100
(chores) camel-maven-package-plugin: use more performant methods when
possible
---
.../main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java | 2 +-
.../apache/camel/maven/packaging/EndpointUriFactoryGenerator.java | 2 +-
.../org/apache/camel/maven/packaging/PackageDataFormatMojo.java | 6 +++---
.../java/org/apache/camel/maven/packaging/PrepareAssemblyMojo.java | 6 +++---
.../java/org/apache/camel/maven/packaging/PrepareParentPomMojo.java | 4 ++--
.../apache/camel/maven/packaging/PropertyConfigurerGenerator.java | 4 ++--
.../java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java | 2 +-
.../dsl/component/ComponentDslInnerImplBuilderGenerator.java| 2 +-
8 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index 89b6728..893e17b 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -952,7 +952,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
if (option.isDeprecated()) {
descSb.append(" deprecated");
}
-descSb.append("\n" + option.getDescription());
+descSb.append("\n").append(option.getDescription());
if (option.getDefaultValue() != null) {
descSb.append("\nDefault value:
").append(option.getDefaultValue());
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java
index afdf8c8..dcd5260 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java
@@ -111,7 +111,7 @@ public final class EndpointUriFactoryGenerator {
w.append("\n");
w.append("@Override\n");
w.append("public boolean isLenientProperties() {\n");
-w.append("return " + model.isLenientProperties() + ";\n");
+w.append("return
").append(model.isLenientProperties()).append(";\n");
w.append("}\n");
w.append("}\n");
w.append("\n");
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
index bc0ccc8..461861f 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
@@ -22,7 +22,6 @@ import java.io.StringWriter;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -222,8 +221,9 @@ public class PackageDataFormatMojo extends
AbstractGeneratorMojo {
.collect(Collectors.toSet());
List options =
parseConfigurationSource(project, javaType);
options.removeIf(o -> !names.contains(o.getName()));
-
names.removeAll(options.stream().map(DataFormatOptionModel::getName).collect(Collectors.toList()));
-names.removeAll(Arrays.asList("id"));
+
options.stream().map(DataFormatOptionModel::getName).collect(Collectors.toList())
+.forEach(names::remove);
+names.removeAll(List.of("id"));
if (!names.isEmpty()) {
log.warn("Unmapped options: " + String.join(",",
names));
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareAssemblyMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareAssemblyMojo.java
index 59becdd..5a2291e 100644
---
[camel] 03/09: (chores) camel-maven-package-plugin: removed redundant calls to toString()
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
commit eff3488a7b50fd1aeac3668e261d4810e2f7e78a
Author: Otavio Rodolfo Piske
AuthorDate: Fri Feb 11 11:39:32 2022 +0100
(chores) camel-maven-package-plugin: removed redundant calls to toString()
---
.../java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java | 4 ++--
.../org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java | 2 +-
.../org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java | 2 +-
.../src/main/java/org/apache/camel/maven/packaging/XRefCheckMojo.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
index 6f9f9dd..0f9d995 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
@@ -64,7 +64,7 @@ public abstract class AbstractGenerateMojo extends
AbstractMojo {
writeIncrementalInfo(project);
}
} catch (Exception e) {
-throw new MojoFailureException("Error generating data " +
e.toString(), e);
+throw new MojoFailureException("Error generating data " + e, e);
}
}
@@ -178,7 +178,7 @@ public abstract class AbstractGenerateMojo extends
AbstractMojo {
try (ZipFile zf = new ZipFile(file)) {
return zf.stream().filter(ze -> !ze.isDirectory())
.filter(ze ->
ze.getLastModifiedTime().toMillis() > lastmod)
-.map(ze -> file.toString() + "!" +
ze.getName()).collect(Collectors.toList()).stream();
+.map(ze -> file + "!" +
ze.getName()).collect(Collectors.toList()).stream();
} catch (IOException e) {
throw new IOException("Error reading zip file: " +
file, e);
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
index db6b4d3..cfad994 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
@@ -339,7 +339,7 @@ public class EndpointSchemaGeneratorMojo extends
AbstractGeneratorMojo {
}
data = PackageHelper.loadText(is);
} catch (Exception e) {
-throw new RuntimeException("Error while loading " + fileName + ":
" + e.toString(), e);
+throw new RuntimeException("Error while loading " + fileName + ":
" + e, e);
}
resources.put(fileName, data);
return data;
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java
index 24e2aa8..afdf8c8 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java
@@ -213,7 +213,7 @@ public final class EndpointUriFactoryGenerator {
for (String alt : alts) {
sj.add("\"" + alt + "\"");
}
-sb.append(sj.toString());
+sb.append(sj);
sb.append("}");
}
if (sb.length() == 0) {
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/XRefCheckMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/XRefCheckMojo.java
index 0cac411..7f145ef 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/XRefCheckMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/XRefCheckMojo.java
@@ -116,7 +116,7 @@ public class XRefCheckMojo extends AbstractMojo {
.filter(Files::isRegularFile)
.forEach(page -> {
Path rel =
pagesDir.relativize(page);
-
[camel] branch main updated (ad0be74b -> 3337bf4)
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 ad0be74b (chores) ci: experimental support for automated PR analysis with SonarCloud new d4fc4cc (chores) camel-maven-package-plugin: use final variables and fields when possible new b0bc076 (chores) camel-maven-package-plugin: consolidate duplicated logic new eff3488 (chores) camel-maven-package-plugin: removed redundant calls to toString() new 69ac29d (chores) camel-maven-package-plugin: consolidate duplicated logic new d886a86 (chores) camel-maven-package-plugin: use more performant methods when possible new 9b1b907 (chores) camel-maven-package-plugin: use modern Java language features when possible new 0ca0bd4 (chores) camel-maven-package-plugin: removed unused and/or dead code new 6be8e98 (chores) camel-maven-package-plugin: consolidate duplicated logic new 3337bf4 (chores) camel-maven-package-plugin: remove unused and/or dead code The 9 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: .../packaging/AbstractGenerateConfigurerMojo.java | 9 +- .../maven/packaging/AbstractGenerateMojo.java | 26 ++--- .../maven/packaging/AbstractGeneratorMojo.java | 2 +- .../camel/maven/packaging/EndpointDslMojo.java | 19 +--- .../packaging/EndpointSchemaGeneratorMojo.java | 9 +- .../packaging/EndpointUriFactoryGenerator.java | 4 +- .../apache/camel/maven/packaging/MvelHelper.java | 3 +- .../packaging/PackageArchetypeCatalogMojo.java | 12 +-- .../maven/packaging/PackageDataFormatMojo.java | 6 +- .../camel/maven/packaging/PrepareAssemblyMojo.java | 6 +- .../camel/maven/packaging/PrepareCatalogMojo.java | 7 +- .../camel/maven/packaging/PrepareExampleMojo.java | 3 +- .../maven/packaging/PrepareParentPomMojo.java | 4 +- .../packaging/PropertyConfigurerGenerator.java | 4 +- .../camel/maven/packaging/SchemaGeneratorMojo.java | 2 +- .../camel/maven/packaging/UpdateReadmeMojo.java| 6 +- .../camel/maven/packaging/XRefCheckMojo.java | 4 +- .../camel/maven/packaging/dsl/DslHelper.java | 70 - .../ComponentDslBuilderFactoryGenerator.java | 2 +- .../ComponentDslInnerImplBuilderGenerator.java | 2 +- .../ComponentsBuilderFactoryGenerator.java | 2 +- .../component/ComponentsDslMetadataRegistry.java | 6 +- .../camel/maven/packaging/generics/ClassUtil.java | 2 +- .../maven/packaging/generics/GenericsUtil.java | 112 - .../generics/OwbGenericArrayTypeImpl.java | 2 +- .../packaging/generics/OwbTypeVariableImpl.java| 11 +- .../packaging/generics/OwbWildcardTypeImpl.java| 4 +- 27 files changed, 83 insertions(+), 256 deletions(-)
[camel] 02/09: (chores) camel-maven-package-plugin: consolidate duplicated logic
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
commit b0bc0765e749358fb169414fddc0aae2c0f550b8
Author: Otavio Rodolfo Piske
AuthorDate: Fri Feb 11 11:39:23 2022 +0100
(chores) camel-maven-package-plugin: consolidate duplicated logic
---
.../camel/maven/packaging/AbstractGenerateConfigurerMojo.java | 2 +-
.../apache/camel/maven/packaging/AbstractGenerateMojo.java| 11 +++
.../java/org/apache/camel/maven/packaging/MvelHelper.java | 2 +-
.../org/apache/camel/maven/packaging/PrepareCatalogMojo.java | 4 ++--
.../org/apache/camel/maven/packaging/PrepareExampleMojo.java | 3 +--
.../org/apache/camel/maven/packaging/UpdateReadmeMojo.java| 6 ++
.../camel/maven/packaging/generics/OwbTypeVariableImpl.java | 3 ++-
7 files changed, 12 insertions(+), 19 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
index 2846049..c0c8750 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
@@ -407,7 +407,7 @@ public abstract class AbstractGenerateConfigurerMojo
extends AbstractGeneratorMo
private boolean filterSetter(Method setter) {
// special for some
-if ("setBindingMode".equals(setter.getName())) {
+if ("setBindingMode".equals(setter.getName()) ||
"setHostNameResolver".equals(setter.getName())) {
// we only want the string setter
return setter.getParameterTypes()[0] == String.class;
} else if ("setHostNameResolver".equals(setter.getName())) {
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
index e6b0a67..6f9f9dd 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
@@ -43,6 +43,7 @@ import org.apache.maven.project.MavenProjectHelper;
import org.sonatype.plexus.build.incremental.BuildContext;
public abstract class AbstractGenerateMojo extends AbstractMojo {
+private static final String INCREMENTAL_DATA = "";
@Parameter(property = "project", required = true, readonly = true)
protected MavenProject project;
@@ -116,14 +117,8 @@ public abstract class AbstractGenerateMojo extends
AbstractMojo {
private boolean isUpToDate(MavenProject project) throws
MojoExecutionException {
try {
Path cacheData = getIncrementalDataPath(project);
-String prvdata;
-if (Files.isRegularFile(cacheData)) {
-prvdata = new String(Files.readAllBytes(cacheData),
StandardCharsets.UTF_8);
-} else {
-prvdata = null;
-}
-String curdata = getIncrementalData();
-if (curdata.equals(prvdata)) {
+final String prvdata = getPreviousRunData(cacheData);
+if (prvdata.isEmpty()) {
long lastmod = Files.getLastModifiedTime(cacheData).toMillis();
Set stale = Stream.concat(Stream.concat(
project.getCompileSourceRoots().stream().map(File::new),
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MvelHelper.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MvelHelper.java
index 9db78f0..42f158b 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MvelHelper.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MvelHelper.java
@@ -41,7 +41,7 @@ public final class MvelHelper {
final String escapedCurlyBrackets =
CURLY_BRACKET_ESCAPE.matcher(raw).replaceAll("$1\\}");
final String escapedUrls =
URL_ESCAPE.matcher(escapedCurlyBrackets).replaceAll("$1");
-return escapedUrls;
+return URL_ESCAPE.matcher(escapedCurlyBrackets).replaceAll("$1");
}
public static String componentName(String scheme) {
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
index
[GitHub] [camel] orpiske merged pull request #6932: (chores) Another round of cleanups for the camel-maven-package-plugin
orpiske merged pull request #6932: URL: https://github.com/apache/camel/pull/6932 -- 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: DebeziumMongodbTest skipped tests #3213
This is an automated email from the ASF dual-hosted git repository.
ppalaga 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 64a18af DebeziumMongodbTest skipped tests #3213
64a18af is described below
commit 64a18af14d43cd7ecd60ed6a80266370aba72cbb
Author: JiriOndrusek
AuthorDate: Thu Nov 4 16:19:48 2021 +0100
DebeziumMongodbTest skipped tests #3213
---
.../common/it/mongodb/DebeziumMongodbTest.java | 13 ++--
.../common/it/mysql/DebeziumMysqlTest.java | 36 +++---
.../common/it/sqlserver/DebeziumSqlserverTest.java | 33
3 files changed, 14 insertions(+), 68 deletions(-)
diff --git
a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbTest.java
b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbTest.java
index 5ef6cf6..cbf9390 100644
---
a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbTest.java
+++
b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbTest.java
@@ -40,12 +40,12 @@ import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
-import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
@QuarkusTest
@@ -54,9 +54,6 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue;
class DebeziumMongodbTest extends AbstractDebeziumTest {
private static final Logger LOG =
Logger.getLogger(DebeziumMongodbTest.class);
-//constant with value of Type.mongodb.getJdbcProperty
-public static final String PROPERTY_JDBC = "mongodb_jdbc";
-
private static MongoClient mongoClient;
private static MongoCollection companies;
@@ -74,10 +71,10 @@ class DebeziumMongodbTest extends AbstractDebeziumTest {
if (mongoUrl.isPresent()) {
mongoClient = MongoClients.create(mongoUrl.get());
} else {
-LOG.warn("Container is not running. Connection is not created.");
+fail("Container is not running. Connection is not created.");
}
-assumeTrue(mongoClient != null);
+assertNotNull(mongoClient, String.format("Can not create client for
url '%s'.", mongoUrl.get()));
MongoDatabase db = mongoClient.getDatabase("test");
@@ -108,7 +105,6 @@ class DebeziumMongodbTest extends AbstractDebeziumTest {
@Test
@Order(0)
-@EnabledIfSystemProperty(named = PROPERTY_JDBC, matches = ".*")
public void testReceiveInit() {
receiveResponse()
.then()
@@ -131,14 +127,12 @@ class DebeziumMongodbTest extends AbstractDebeziumTest {
@Test
@Order(1)
-@EnabledIfSystemProperty(named = PROPERTY_JDBC, matches = ".*")
public void testInsert() throws SQLException {
super.testInsert();
}
@Test
@Order(2)
-@EnabledIfSystemProperty(named = PROPERTY_JDBC, matches = ".*")
public void testUpdate() throws SQLException {
Document doc = new Document().append("name", COMPANY_2).append("city",
CITY_2);
companies.insertOne(doc);
@@ -156,7 +150,6 @@ class DebeziumMongodbTest extends AbstractDebeziumTest {
@Test
@Order(3)
-@EnabledIfSystemProperty(named = PROPERTY_JDBC, matches = ".*")
public void testDelete() throws SQLException {
DeleteResult dr = companies.deleteMany(new Document().append("name",
COMPANY_2));
assertEquals(1, dr.getDeletedCount(), "Only one company should be
deleted.");
diff --git
a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mysql/DebeziumMysqlTest.java
b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mysql/DebeziumMysqlTest.java
index 734ecc2..8530879 100644
---
a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mysql/DebeziumMysqlTest.java
+++
b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mysql/DebeziumMysqlTest.java
@@ -29,12 +29,12 @@ import org.eclipse.microprofile.config.Config;
import org.eclipse.microprofile.config.ConfigProvider;
import org.jboss.logging.Logger;
import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assumptions;
import
[camel] branch main updated (c2ac4c4 -> ad0be74b)
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 c2ac4c4 CAMEL-17630: camel-microprofile - Update to newer releases add ad0be74b (chores) ci: experimental support for automated PR analysis with SonarCloud No new revisions were added by this update. Summary of changes: .github/workflows/master-pr-build.yml | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-)
[GitHub] [camel] orpiske opened a new pull request #6933: (DO NOT MERGE) Added a fake sleep to showcase automated analysis
orpiske opened a new pull request #6933: URL: https://github.com/apache/camel/pull/6933 Please do not merge. I am working w/ folks from SonarCloud to debug the analysis issue on PRs. -- 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] ppalaga closed issue #3213: `DebeziumMongodbTest` skipped tests
ppalaga closed issue #3213: URL: https://github.com/apache/camel-quarkus/issues/3213 -- 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] ppalaga merged pull request #3266: DebeziumMongodbTest skipped tests #3213
ppalaga merged pull request #3266: URL: https://github.com/apache/camel-quarkus/pull/3266 -- 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 issue #3003: Operator creates to many repositories
squakez commented on issue #3003: URL: https://github.com/apache/camel-k/issues/3003#issuecomment-1036172868 No problem. About point 1, that is not correct. The Kit should be reused as a base layer for Integrations that are similar (for instance, a similar set of dependencies). Let's say you develop this integration: ``` kamel run Sample.java ``` And then, another integration such as ``` kamel run Sample2.java -d camel-zipfile ``` We expect, the second integration to have an IntegrationKit built on top of the first IntegrationKit as there is only 1 dependency difference between both. Unfortunately, you may have experienced #3007, which lately made the incremental build to be broken. About point 3, I am not sure to understand the question. Do you refers to the `[IntegrationPlatform](https://camel.apache.org/camel-k/1.8.x/architecture/cr/integration-platform.html)`, maybe? -- 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 opened a new pull request #3008: fix(build): incremental build
squakez opened a new pull request #3008: URL: https://github.com/apache/camel-k/pull/3008 * Fixed the SHA1 which were not calculated properly * Added a check to verify that the base image != default expected * Unit and E2E test to make sure we'll be warned if the behavior is broken again Closes #3007 **Release Note** ```release-note NONE ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. 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] catshout commented on issue #3003: Operator creates to many repositories
catshout commented on issue #3003: URL: https://github.com/apache/camel-k/issues/3003#issuecomment-1036162197 Thanks @squakez for the reply. Let me summarize my understanding .. 1. So an Integration Kit is 1:1 related to an Integration and is NOT re-usable for another Integration. Is my understanding right? 2. We will proceed with the workaround you suggested `kubectl integrationkit delete` to cleanup the space after the integration is running. Same with the deletion of the corresponding repository. Is the ready state of the Integration Kit an indicator that this can be done with no side effects? 3. What does the platform Integration Kit perform when installing the Camel-K Operator? Best Gerald -- 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 edited a comment on issue #3003: Operator creates to many repositories
squakez edited a comment on issue #3003: URL: https://github.com/apache/camel-k/issues/3003#issuecomment-1036157808 By the way, you may have also been affected by #3007 which may have caused the incremental build not to work at all in the latest Camel K versions. Your question made me dig and discover this bug, thanks for it! This wrong behavior could be an additional reason to the high amount of containers you have experienced lately. -- 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 issue #3003: Operator creates to many repositories
squakez commented on issue #3003: URL: https://github.com/apache/camel-k/issues/3003#issuecomment-1036157808 By the way, you may have also been affected by #3007 which may have caused the incremental build not to work at all in the latest Camel K versions. That could be an additional reason to the high amount of containers you have experienced. -- 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 (b0bfbf6 -> c2ac4c4)
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 b0bfbf6 Sync deps add c2ac4c4 CAMEL-17630: camel-microprofile - Update to newer releases No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 7 ++- .../faulttolerance/FaultToleranceProcessor.java| 8 +-- .../camel-microprofile-health/pom.xml | 32 .../CamelMicroProfileHealthCheckRegistry.java | 28 -- .../health/CamelMicroProfileHealthHelper.java | 59 -- .../health/CamelMicroProfileHealthTestSupport.java | 37 +++--- parent/pom.xml | 7 ++- 7 files changed, 48 insertions(+), 130 deletions(-)
[GitHub] [camel] orpiske opened a new pull request #6932: (chores) Another round of cleanups for the camel-maven-package-plugin
orpiske opened a new pull request #6932: URL: https://github.com/apache/camel/pull/6932 -- 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: Update articles.md
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-website.git The following commit(s) were added to refs/heads/main by this push: new 527e833 Update articles.md 527e833 is described below commit 527e8333755ff10b1165981a0dae9183e08c5646 Author: Claus Ibsen AuthorDate: Fri Feb 11 12:23:51 2022 +0100 Update articles.md --- content/community/articles.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/community/articles.md b/content/community/articles.md index 625eb95..2c1da24 100644 --- a/content/community/articles.md +++ b/content/community/articles.md @@ -337,6 +337,7 @@ These examples show Camel combined with several tools (e.g. IDE), ESBs, Applicat ## Online Training +* [Fundamentals of Integration with Apache Camel](https://www.pluralsight.com/courses/apache-camel-fundamentals-integration) - Pluralsight Training Course (launched in February 2022) by Michael Hoffman. Course with introduction on Apache Camel, its concepts and EIPs, and how-to examples, and also running Camel-K on Kubernetes * [Build a Registration System with Camel and Kubernetes](https://www.manning.com/liveproject/build-a-registration-system-with-camel-and-kubernetes) - A self-pased online learning (May 2021) where you’ll master common Apache Camel techniques and components for helping build modern interconnected applications. * [Introduction to Apache Camel](http://www.pluralsight.com/courses/apache-camel-intro-integration) - Pluralsight online training course covering the core Camel framework, pattern implementations and [hawt.io](http://hawt.io/) * [Apache Camel Video Tutorial](http://www.nvisia.com/apache-camel-video-tutorial) - A 3 part video series that introduces you to Apache Camel, covers an use-case, and then highlights why you should use Camel.
[GitHub] [camel-examples] davsclaus merged pull request #73: CAMEL-17611: Refactor the config of loadbalancing to leverage the templated routes
davsclaus merged pull request #73: URL: https://github.com/apache/camel-examples/pull/73 -- 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-examples] branch main updated (d747186 -> e0a7b23)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-examples.git. from d747186 CAMEL-17611: Add examples to show how to use templatedRoute (#71) add e0a7b23 CAMEL-17611: Refactor the config of loadbalancing to leverage the templated routes (#73) No new revisions were added by this update. Summary of changes: .../camel/example/ArtemisLargeMessageTest.java | 2 +- .../META-INF/spring/camel-context-mina1.xml | 12 .../META-INF/spring/camel-context-mina2.xml | 13 - .../META-INF/spring/camel-route-context-mina1.xml| 18 -- .../META-INF/spring/camel-route-context-mina2.xml| 18 -- .../META-INF/spring/camel-route-template-mina.xml| 20 .../org/apache/camel/example/LoadBalancingTest.java | 2 +- .../org/apache/camel/example/test-camel-context.xml | 16 ++-- 8 files changed, 48 insertions(+), 53 deletions(-) delete mode 100644 examples/loadbalancing/src/main/resources/META-INF/spring/camel-route-context-mina1.xml delete mode 100644 examples/loadbalancing/src/main/resources/META-INF/spring/camel-route-context-mina2.xml create mode 100644 examples/loadbalancing/src/main/resources/META-INF/spring/camel-route-template-mina.xml
[camel] branch main updated: CAMEL-17630: camel-microprofile - Update to newer releases
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton 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 c2ac4c4 CAMEL-17630: camel-microprofile - Update to newer releases
c2ac4c4 is described below
commit c2ac4c44a136fc8512a9bc90d72a182069e4b220
Author: James Netherton
AuthorDate: Fri Feb 11 09:58:06 2022 +
CAMEL-17630: camel-microprofile - Update to newer releases
---
camel-dependencies/pom.xml | 7 ++-
.../faulttolerance/FaultToleranceProcessor.java| 8 +--
.../camel-microprofile-health/pom.xml | 32
.../CamelMicroProfileHealthCheckRegistry.java | 28 --
.../health/CamelMicroProfileHealthHelper.java | 59 --
.../health/CamelMicroProfileHealthTestSupport.java | 37 +++---
parent/pom.xml | 7 ++-
7 files changed, 48 insertions(+), 130 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 939f02b..b6bfd08 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -443,7 +443,7 @@
3.2.1
3.10
${opentelemetry-version}-alpha
-1.10.1
+1.11.0
0.1.8
0.33.0
8.16.1.Final
@@ -500,8 +500,8 @@
1.7.35
4.3.5
2.8.2
-5.2.1
-3.1.2
+5.3.0
+3.2.0
3.0.4
2.3
1.30
@@ -550,7 +550,6 @@
0.7
0.8.0
3.6.0
-2.0.2.Final
3.1.8.Final
1.11.4.Final
2.32.0
diff --git
a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceProcessor.java
b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceProcessor.java
index b29ead5..5e6c3a2 100644
---
a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceProcessor.java
+++
b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceProcessor.java
@@ -31,7 +31,7 @@ import
io.smallrye.faulttolerance.core.stopwatch.SystemStopwatch;
import io.smallrye.faulttolerance.core.timeout.ScheduledExecutorTimeoutWatcher;
import io.smallrye.faulttolerance.core.timeout.Timeout;
import io.smallrye.faulttolerance.core.timeout.TimeoutWatcher;
-import io.smallrye.faulttolerance.core.util.SetOfThrowables;
+import io.smallrye.faulttolerance.core.util.ExceptionDecision;
import org.apache.camel.AsyncCallback;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
@@ -254,7 +254,7 @@ public class FaultToleranceProcessor extends
AsyncProcessorSupport
target = new Fallback(target, "fallback", fallbackContext -> {
exchange.setException(fallbackContext.failure);
return fFallbackTask.call();
-}, SetOfThrowables.ALL, SetOfThrowables.EMPTY);
+}, ExceptionDecision.ALWAYS_FAILURE);
}
try {
@@ -331,8 +331,8 @@ public class FaultToleranceProcessor extends
AsyncProcessorSupport
ObjectHelper.notNull(camelContext, "CamelContext", this);
if (circuitBreaker == null) {
circuitBreaker = new CircuitBreaker(
-invocation(), id, SetOfThrowables.ALL,
-SetOfThrowables.EMPTY, config.getDelay(),
config.getRequestVolumeThreshold(), config.getFailureRatio(),
+invocation(), id, ExceptionDecision.ALWAYS_FAILURE,
config.getDelay(), config.getRequestVolumeThreshold(),
+config.getFailureRatio(),
config.getSuccessThreshold(), new SystemStopwatch());
}
diff --git a/components/camel-microprofile/camel-microprofile-health/pom.xml
b/components/camel-microprofile/camel-microprofile-health/pom.xml
index a375337..ba930e0 100644
--- a/components/camel-microprofile/camel-microprofile-health/pom.xml
+++ b/components/camel-microprofile/camel-microprofile-health/pom.xml
@@ -56,26 +56,12 @@
${smallrye-config-version}
-
-
-javax.enterprise
-cdi-api
-${cdi-api-2.0-version}
-provided
-
-
org.apache.camel
camel-test-junit5
test
-
-org.jboss.weld
-weld-junit5
-${weld-junit5-version}
-test
-
@@ -104,22 +90,4 @@
-
-
-jdk17-build
-
-[17,)
-
-
-
-
-maven-surefire-plugin
-
[GitHub] [camel] jamesnetherton merged pull request #6931: CAMEL-17630: camel-microprofile - Update to newer releases
jamesnetherton merged pull request #6931: URL: https://github.com/apache/camel/pull/6931 -- 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/02: Upgrade to Quarkus 2.8.0.CR1
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 2b47db7eb65a1e6673dedb0eb4f77ffded508e45
Author: James Netherton
AuthorDate: Thu Jan 20 07:52:37 2022 +
Upgrade to Quarkus 2.8.0.CR1
---
docs/antora.yml| 4 +--
integration-tests/http/pom.xml | 2 +-
.../kafka/oauth/it/container/KafkaContainer.java | 30 +-
integration-tests/vertx-websocket/pom.xml | 2 +-
pom.xml| 7 ++---
poms/build-parent/pom.xml | 9 +++
6 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 1413755..1db4eff 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -31,8 +31,8 @@ asciidoc:
target-maven-version: 3.8.4 # replace ${target-maven-version}
camel-version: 3.15.0 # replace ${camel.version}
camel-docs-version: 3.15.x # replace ${camel.docs.components.version}
-quarkus-version: 2.7.1.Final # replace ${quarkus.version}
-graalvm-version: 21.3.1 # replace ${graalvm.version}
+quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
+graalvm-version: 22.0.0.2 # replace ${graalvm.version}
graalvm-docs-version: 21.3
# attributes used in xrefs to other Antora components
cq-camel-components: 3.15.x@components # replace
${camel.docs.components.xref}
diff --git a/integration-tests/http/pom.xml b/integration-tests/http/pom.xml
index 0bb8a2a..793de20 100644
--- a/integration-tests/http/pom.xml
+++ b/integration-tests/http/pom.xml
@@ -61,7 +61,7 @@
io.quarkus
-quarkus-undertow-websockets
+quarkus-websockets
io.quarkus
diff --git
a/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
b/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
index 31885bf..e95e062 100644
---
a/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
+++
b/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
@@ -16,17 +16,20 @@
*/
package org.apache.camel.quarkus.kafka.oauth.it.container;
-import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.StringReader;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import javax.json.Json;
+import javax.json.stream.JsonParser;
+
import com.github.dockerjava.api.command.InspectContainerResponse;
-import io.strimzi.StrimziKafkaContainer;
+import io.strimzi.test.container.StrimziKafkaContainer;
+import org.apache.commons.io.IOUtils;
import org.jboss.logging.Logger;
import org.testcontainers.containers.FixedHostPortGenericContainer;
import org.testcontainers.containers.Network;
@@ -45,19 +48,22 @@ public class KafkaContainer extends
FixedHostPortGenericContainer supportedKafkaVersions = new
ArrayList<>(3);
+private static final List supportedKafkaVersions = new
ArrayList<>();
static {
-InputStream inputStream =
StrimziKafkaContainer.class.getResourceAsStream("/kafka-versions.txt");
-InputStreamReader streamReader = new InputStreamReader(inputStream,
StandardCharsets.UTF_8);
-
-try (BufferedReader bufferedReader = new BufferedReader(streamReader))
{
-String kafkaVersion;
-while ((kafkaVersion = bufferedReader.readLine()) != null) {
-supportedKafkaVersions.add(kafkaVersion);
+InputStream inputStream =
StrimziKafkaContainer.class.getResourceAsStream("/kafka_versions.json");
+try {
+String json = IOUtils.toString(inputStream,
StandardCharsets.UTF_8);
+try (JsonParser parser = Json.createParser(new
StringReader(json))) {
+parser.next();
+parser.getObject()
+.get("kafkaVersions")
+.asJsonObject()
+.keySet()
+.forEach(supportedKafkaVersions::add);
}
} catch (IOException e) {
-LOGGER.error("Unable to load the supported Kafka versions", e);
+throw new RuntimeException(e);
}
// sort kafka version from low to high
diff --git a/integration-tests/vertx-websocket/pom.xml
b/integration-tests/vertx-websocket/pom.xml
index 7947fe5..abd5e2a 100644
--- a/integration-tests/vertx-websocket/pom.xml
+++ b/integration-tests/vertx-websocket/pom.xml
@@ -39,7 +39,7 @@
io.quarkus
-
[camel-quarkus] 02/02: Temporary hacks to handle version misalignment of smallrye-health and smallrye-faulttolerance in Quarkus & Camel
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 2eef06b9003b78719fc17f984ba47d3cad10664e
Author: James Netherton
AuthorDate: Fri Feb 11 10:08:03 2022 +
Temporary hacks to handle version misalignment of smallrye-health and
smallrye-faulttolerance in Quarkus & Camel
---
.../MicroprofileFaultToleranceProcessor.java | 9 +
.../microprofile-fault-tolerance/runtime/pom.xml | 2 +
.../FaultToleranceConfiguration.java | 120 +
.../faulttolerance/FaultToleranceConstants.java} | 21 +-
.../faulttolerance/FaultToleranceProcessor.java| 536 +
.../FaultToleranceProcessorFactory.java} | 28 +-
.../faulttolerance/FaultToleranceReifier.java | 193
.../apache/camel/model/CircuitBreakerDefinition| 18 +
.../deployment/MicroProfileHealthEnabledTest.java | 4 +-
.../runtime/CamelMicroProfileHealthCheck.java | 67 +++
.../runtime/CamelMicroProfileHealthHelper.java | 63 +++
.../runtime/CamelMicroProfileHealthRecorder.java | 3 +-
.../CamelMicroProfileRepositoryHealthCheck.java| 72 +++
...amelQuarkusMicroProfileHealthCheckRegistry.java | 185 +++
.../it/CoreFaultToleranceProducers.java| 4 +-
15 files changed, 1287 insertions(+), 38 deletions(-)
diff --git
a/extensions/microprofile-fault-tolerance/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/fault/tolerance/deployment/MicroprofileFaultToleranceProcessor.java
b/extensions/microprofile-fault-tolerance/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/fault/tolerance/deployment/MicroprofileFaultToleranceProcessor.java
index 05673b1..6e8c382 100644
---
a/extensions/microprofile-fault-tolerance/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/fault/tolerance/deployment/MicroprofileFaultToleranceProcessor.java
+++
b/extensions/microprofile-fault-tolerance/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/fault/tolerance/deployment/MicroprofileFaultToleranceProcessor.java
@@ -16,9 +16,13 @@
*/
package
org.apache.camel.quarkus.component.microprofile.fault.tolerance.deployment;
+import java.nio.file.Paths;
+
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import
io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import
org.apache.camel.component.microprofile.faulttolerance.FaultToleranceProcessorFactory;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceBuildItem;
class MicroprofileFaultToleranceProcessor {
@@ -35,4 +39,9 @@ class MicroprofileFaultToleranceProcessor {
"META-INF/services/org/apache/camel/model/CircuitBreakerDefinition");
}
+@BuildStep
+CamelServiceBuildItem camelCronServicePattern() {
+return new
CamelServiceBuildItem(Paths.get("META-INF/services/org/apache/camel/model/CircuitBreakerDefinition"),
+FaultToleranceProcessorFactory.class.getName());
+}
}
diff --git a/extensions/microprofile-fault-tolerance/runtime/pom.xml
b/extensions/microprofile-fault-tolerance/runtime/pom.xml
index 3401f07..22e3962 100644
--- a/extensions/microprofile-fault-tolerance/runtime/pom.xml
+++ b/extensions/microprofile-fault-tolerance/runtime/pom.xml
@@ -56,10 +56,12 @@
org.apache.camel.quarkus
camel-quarkus-core
+
diff --git
a/extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceConfiguration.java
b/extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceConfiguration.java
new file mode 100644
index 000..7cb3d4d
--- /dev/null
+++
b/extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceConfiguration.java
@@ -0,0 +1,120 @@
+/*
+ * 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
