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-quarkus.git
The following commit(s) were added to refs/heads/main by this push: new f575eb79e1 Add SMB extension f575eb79e1 is described below commit f575eb79e12c8fd0f15fbd6501947c6b664d39ef Author: shravani <spatn...@redhat.com> AuthorDate: Fri Jan 12 12:46:53 2024 +0530 Add SMB extension Fixes #5646 --- docs/modules/ROOT/examples/components/smb.yml | 13 ++ docs/modules/ROOT/nav.adoc | 1 + .../ROOT/pages/reference/extensions/smb.adoc | 45 ++++++ extensions/pom.xml | 1 + extensions/smb/deployment/pom.xml | 67 +++++++++ .../smb/deployment/JakartaEnablement.java | 94 +++++++++++++ .../component/smb/deployment/SmbProcessor.java | 50 +++++++ extensions/smb/pom.xml | 39 ++++++ extensions/smb/runtime/pom.xml | 105 ++++++++++++++ .../main/resources/META-INF/quarkus-extension.yaml | 32 +++++ integration-tests/pom.xml | 1 + integration-tests/smb/pom.xml | 156 +++++++++++++++++++++ .../quarkus/component/smb/it/SmbResource.java | 42 ++++++ .../camel/quarkus/component/smb/it/SmbRoute.java | 28 ++++ .../camel/quarkus/component/smb/it/SmbIT.java | 24 ++++ .../camel/quarkus/component/smb/it/SmbTest.java | 34 +++++ .../quarkus/component/smb/it/SmbTestResource.java | 61 ++++++++ .../smb/src/test/resources/Dockerfile | 25 ++++ integration-tests/smb/src/test/resources/smb.conf | 61 ++++++++ integration-tests/smb/src/test/resources/start.sh | 39 ++++++ poms/bom/pom.xml | 43 ++++-- poms/bom/src/main/generated/flattened-full-pom.xml | 43 ++++-- .../src/main/generated/flattened-reduced-pom.xml | 43 ++++-- .../generated/flattened-reduced-verbose-pom.xml | 43 ++++-- tooling/scripts/test-categories.yaml | 1 + 25 files changed, 1047 insertions(+), 44 deletions(-) diff --git a/docs/modules/ROOT/examples/components/smb.yml b/docs/modules/ROOT/examples/components/smb.yml new file mode 100644 index 0000000000..b8e248a80c --- /dev/null +++ b/docs/modules/ROOT/examples/components/smb.yml @@ -0,0 +1,13 @@ +# Do not edit directly! +# This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page +cqArtifactId: camel-quarkus-smb +cqArtifactIdBase: smb +cqNativeSupported: true +cqStatus: Stable +cqDeprecated: false +cqJvmSince: 3.7.0 +cqNativeSince: 3.7.0 +cqCamelPartName: smb +cqCamelPartTitle: SMB +cqCamelPartDescription: Receive files from SMB (Server Message Block) shares. +cqExtensionPageTitle: SMB diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc index 8a99614e78..74f3ef295b 100644 --- a/docs/modules/ROOT/nav.adoc +++ b/docs/modules/ROOT/nav.adoc @@ -250,6 +250,7 @@ *** xref:reference/extensions/sap-netweaver.adoc[SAP NetWeaver] *** xref:reference/extensions/jsch.adoc[SCP] *** xref:reference/extensions/seda.adoc[SEDA] +*** xref:reference/extensions/smb.adoc[SMB] *** xref:reference/extensions/smpp.adoc[SMPP] *** xref:reference/extensions/snmp.adoc[SNMP] *** xref:reference/extensions/soap.adoc[SOAP dataformat] diff --git a/docs/modules/ROOT/pages/reference/extensions/smb.adoc b/docs/modules/ROOT/pages/reference/extensions/smb.adoc new file mode 100644 index 0000000000..be61662e89 --- /dev/null +++ b/docs/modules/ROOT/pages/reference/extensions/smb.adoc @@ -0,0 +1,45 @@ +// Do not edit directly! +// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page +[id="extensions-smb"] += SMB +:linkattrs: +:cq-artifact-id: camel-quarkus-smb +:cq-native-supported: true +:cq-status: Stable +:cq-status-deprecation: Stable +:cq-description: SMB component which consumes natively from file shares using the Server Message Block (SMB, also known as Common Internet File System - CIFS) protocol +:cq-deprecated: false +:cq-jvm-since: 3.7.0 +:cq-native-since: 3.7.0 + +ifeval::[{doc-show-badges} == true] +[.badges] +[.badge-key]##JVM since##[.badge-supported]##3.7.0## [.badge-key]##Native since##[.badge-supported]##3.7.0## +endif::[] + +SMB component which consumes natively from file shares using the Server Message Block (SMB, also known as Common Internet File System - CIFS) protocol + +[id="extensions-smb-whats-inside"] +== What's inside + +* xref:{cq-camel-components}::smb-component.adoc[SMB component], URI syntax: `smb:hostname:port/shareName` + +Please refer to the above link for usage and configuration details. + +[id="extensions-smb-maven-coordinates"] +== Maven coordinates + +https://{link-quarkus-code-generator}/?extension-search=camel-quarkus-smb[Create a new project with this extension on {link-quarkus-code-generator}, window="_blank"] + +Or add the coordinates to your existing project: + +[source,xml] +---- +<dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-smb</artifactId> +</dependency> +---- +ifeval::[{doc-show-user-guide-link} == true] +Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications. +endif::[] diff --git a/extensions/pom.xml b/extensions/pom.xml index 9f4712f1fd..d62e53113f 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -220,6 +220,7 @@ <module>sjms2</module> <module>slack</module> <module>smallrye-reactive-messaging</module> + <module>smb</module> <module>snakeyaml</module> <module>soap</module> <module>splunk</module> diff --git a/extensions/smb/deployment/pom.xml b/extensions/smb/deployment/pom.xml new file mode 100644 index 0000000000..f37ddf5d65 --- /dev/null +++ b/extensions/smb/deployment/pom.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-smb-parent</artifactId> + <version>3.7.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>camel-quarkus-smb-deployment</artifactId> + <name>Camel Quarkus :: SMB :: Deployment</name> + + <dependencies> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-core-deployment</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-smb</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.transformer</groupId> + <artifactId>org.eclipse.transformer</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <annotationProcessorPaths> + <path> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-extension-processor</artifactId> + <version>${quarkus.version}</version> + </path> + </annotationProcessorPaths> + </configuration> + </plugin> + </plugins> + </build> + +</project> diff --git a/extensions/smb/deployment/src/main/java/org/apache/camel/quarkus/component/smb/deployment/JakartaEnablement.java b/extensions/smb/deployment/src/main/java/org/apache/camel/quarkus/component/smb/deployment/JakartaEnablement.java new file mode 100644 index 0000000000..ae07a8dcd8 --- /dev/null +++ b/extensions/smb/deployment/src/main/java/org/apache/camel/quarkus/component/smb/deployment/JakartaEnablement.java @@ -0,0 +1,94 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.component.smb.deployment; + +import java.nio.ByteBuffer; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import io.quarkus.bootstrap.classloading.QuarkusClassLoader; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem; +import org.eclipse.transformer.action.ActionContext; +import org.eclipse.transformer.action.ByteData; +import org.eclipse.transformer.action.impl.ActionContextImpl; +import org.eclipse.transformer.action.impl.ByteDataImpl; +import org.eclipse.transformer.action.impl.ClassActionImpl; +import org.eclipse.transformer.action.impl.SelectionRuleImpl; +import org.eclipse.transformer.action.impl.SignatureRuleImpl; +import org.eclipse.transformer.util.FileUtils; +import org.objectweb.asm.ClassReader; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Required due to net.engio.mbassy.dispatch.el.ElFilter referencing javax.el packages. + * + * TODO: Remove this class if this issue is resolved: https://github.com/bennidi/mbassador/issues/169 + */ +public class JakartaEnablement { + private static final List<String> CLASSES_NEEDING_TRANSFORMATION = List.of( + "net.engio.mbassy.dispatch.el.ElFilter", + "net.engio.mbassy.dispatch.el.ElFilter$ExpressionFactoryHolder", + "net.engio.mbassy.dispatch.el.StandardELResolutionContext"); + + @BuildStep + void transformToJakarta(BuildProducer<BytecodeTransformerBuildItem> transformers) { + if (QuarkusClassLoader.isClassPresentAtRuntime("jakarta.el.ELContext")) { + JakartaTransformer tr = new JakartaTransformer(); + for (String className : CLASSES_NEEDING_TRANSFORMATION) { + final BytecodeTransformerBuildItem item = new BytecodeTransformerBuildItem.Builder() + .setCacheable(true) + .setContinueOnFailure(false) + .setClassToTransform(className) + .setClassReaderOptions(ClassReader.SKIP_DEBUG) + .setInputTransformer(tr::transform) + .build(); + transformers.produce(item); + } + } + } + + private static class JakartaTransformer { + + private final Logger logger; + private final ActionContext ctx; + // We need to prevent the Eclipse Transformer to adjust the "javax" packages. + // Thus why we split the strings. + private static final Map<String, String> renames = Map.of("javax" + ".el", "jakarta.el"); + + JakartaTransformer() { + logger = LoggerFactory.getLogger("JakartaTransformer"); + //N.B. we enable only this single transformation of package renames, not the full set of capabilities of Eclipse Transformer; + //this might need tailoring if the same idea gets applied to a different context. + ctx = new ActionContextImpl(logger, + new SelectionRuleImpl(logger, Collections.emptyMap(), Collections.emptyMap()), + new SignatureRuleImpl(logger, renames, null, null, null, null, null, Collections.emptyMap())); + } + + byte[] transform(final String name, final byte[] bytes) { + logger.debug("Jakarta EE compatibility enhancer for Quarkus: transforming " + name); + final ClassActionImpl classTransformer = new ClassActionImpl(ctx); + final ByteBuffer input = ByteBuffer.wrap(bytes); + final ByteData inputData = new ByteDataImpl(name, input, FileUtils.DEFAULT_CHARSET); + final ByteData outputData = classTransformer.apply(inputData); + return outputData.buffer().array(); + } + } +} diff --git a/extensions/smb/deployment/src/main/java/org/apache/camel/quarkus/component/smb/deployment/SmbProcessor.java b/extensions/smb/deployment/src/main/java/org/apache/camel/quarkus/component/smb/deployment/SmbProcessor.java new file mode 100644 index 0000000000..adb9ffaab6 --- /dev/null +++ b/extensions/smb/deployment/src/main/java/org/apache/camel/quarkus/component/smb/deployment/SmbProcessor.java @@ -0,0 +1,50 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.component.smb.deployment; + +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; + +class SmbProcessor { + + private static final String FEATURE = "camel-smb"; + + @BuildStep + FeatureBuildItem feature() { + return new FeatureBuildItem(FEATURE); + } + + @BuildStep + public void registerForReflection(BuildProducer<ReflectiveClassBuildItem> reflectiveClass) { + + reflectiveClass.produce(ReflectiveClassBuildItem.builder(com.hierynomus.smbj.SMBClient.class.getName()) + .methods() + .build()); + reflectiveClass.produce(ReflectiveClassBuildItem.builder(com.hierynomus.smbj.connection.Connection.class.getName()) + .methods() + .build()); + reflectiveClass + .produce(ReflectiveClassBuildItem.builder(com.hierynomus.smbj.auth.SpnegoAuthenticator.Factory.class.getName()) + .build()); + reflectiveClass + .produce(ReflectiveClassBuildItem.builder("net.engio.mbassy.dispatch.ReflectiveHandlerInvocation") + .build()); + + } +} diff --git a/extensions/smb/pom.xml b/extensions/smb/pom.xml new file mode 100644 index 0000000000..9cfbff60ed --- /dev/null +++ b/extensions/smb/pom.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-extensions</artifactId> + <version>3.7.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>camel-quarkus-smb-parent</artifactId> + <name>Camel Quarkus :: SMB</name> + <packaging>pom</packaging> + + <modules> + <module>deployment</module> + <module>runtime</module> + </modules> +</project> diff --git a/extensions/smb/runtime/pom.xml b/extensions/smb/runtime/pom.xml new file mode 100644 index 0000000000..2226f89370 --- /dev/null +++ b/extensions/smb/runtime/pom.xml @@ -0,0 +1,105 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-smb-parent</artifactId> + <version>3.7.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>camel-quarkus-smb</artifactId> + <name>Camel Quarkus :: SMB :: Runtime</name> + <description>SMB component which consumes natively from file shares using the Server Message Block (SMB, also known as Common Internet File System - CIFS) protocol</description> + + <properties> + <camel.quarkus.jvmSince>3.7.0</camel.quarkus.jvmSince> + <camel.quarkus.nativeSince>3.7.0</camel.quarkus.nativeSince> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-smb</artifactId> + </dependency> + <dependency> + <groupId>jakarta.el</groupId> + <artifactId>jakarta.el-api</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-extension-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <annotationProcessorPaths> + <path> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-extension-processor</artifactId> + <version>${quarkus.version}</version> + </path> + </annotationProcessorPaths> + </configuration> + </plugin> + </plugins> + </build> + + + <profiles> + <profile> + <id>full</id> + <activation> + <property> + <name>!quickly</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-maven-plugin</artifactId> + <executions> + <execution> + <id>update-extension-doc-page</id> + <goals> + <goal>update-extension-doc-page</goal> + </goals> + <phase>process-classes</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> diff --git a/extensions/smb/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/smb/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 0000000000..9609146918 --- /dev/null +++ b/extensions/smb/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,32 @@ +# +# 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. +# + +# This is a generated file. Do not edit directly! +# To re-generate, run the following command from the top level directory: +# +# mvn -N cq:update-quarkus-metadata +# +--- +name: "Camel SMB" +description: "SMB component which consumes natively from file shares using the Server Message Block (SMB, also known as Common Internet File System - CIFS) protocol" +metadata: + icon-url: "https://camel.apache.org/_/img/logo-d-f21b25ba38.svg" + guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/smb.html" + categories: + - "integration" + status: + - "stable" diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index f3bb3a9a6e..33c3cb6319 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -209,6 +209,7 @@ <module>sjms2-qpid-amqp-client</module> <module>slack</module> <module>smallrye-reactive-messaging</module> + <module>smb</module> <module>soap</module> <module>splunk</module> <module>spring-rabbitmq</module> diff --git a/integration-tests/smb/pom.xml b/integration-tests/smb/pom.xml new file mode 100644 index 0000000000..c28d3e0cea --- /dev/null +++ b/integration-tests/smb/pom.xml @@ -0,0 +1,156 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-build-parent-it</artifactId> + <version>3.7.0-SNAPSHOT</version> + <relativePath>../../poms/build-parent-it/pom.xml</relativePath> + </parent> + + <artifactId>camel-quarkus-integration-test-smb</artifactId> + <name>Camel Quarkus :: Integration Tests :: SMB</name> + <description>Integration tests for Camel Quarkus SMB extension</description> + + <dependencies> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-smb</artifactId> + </dependency> + <dependency> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-resteasy</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-mock</artifactId> + </dependency> + + <!-- test dependencies --> + <dependency> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-junit5</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>io.rest-assured</groupId> + <artifactId>rest-assured</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.testcontainers</groupId> + <artifactId>testcontainers</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-junit4-mock</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <profiles> + <profile> + <id>native</id> + <activation> + <property> + <name>native</name> + </property> + </activation> + <properties> + <quarkus.package.type>native</quarkus.package.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>integration-test</goal> + <goal>verify</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>virtualDependencies</id> + <activation> + <property> + <name>!noVirtualDependencies</name> + </property> + </activation> + <dependencies> + <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory --> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-mock-deployment</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-smb-deployment</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + </profile> + <profile> + <id>skip-testcontainers-tests</id> + <activation> + <property> + <name>skip-testcontainers-tests</name> + </property> + </activation> + <properties> + <skipTests>true</skipTests> + </properties> + </profile> + </profiles> + +</project> diff --git a/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbResource.java b/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbResource.java new file mode 100644 index 0000000000..2999b8c890 --- /dev/null +++ b/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbResource.java @@ -0,0 +1,42 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.component.smb.it; + +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import org.apache.camel.EndpointInject; +import org.apache.camel.component.mock.MockEndpoint; + +@Path("/smb") +@ApplicationScoped +public class SmbResource { + + @EndpointInject("mock:result") + private MockEndpoint mock; + + @GET + @Path("/validate") + @Produces("text/plain") + public void validateSmbResults() throws Exception { + + mock.expectedMessageCount(100); + + mock.assertIsSatisfied(); + } +} diff --git a/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbRoute.java b/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbRoute.java new file mode 100644 index 0000000000..b2ec2c0dce --- /dev/null +++ b/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbRoute.java @@ -0,0 +1,28 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.component.smb.it; + +import org.apache.camel.builder.RouteBuilder; + +public class SmbRoute extends RouteBuilder { + + @Override + public void configure() throws Exception { + from("smb:{{smb.host}}:{{smb.port}}/{{smb.share}}?username={{smb.username}}&password={{smb.password}}") + .to("mock:result"); + } +} diff --git a/integration-tests/smb/src/test/java/org/apache/camel/quarkus/component/smb/it/SmbIT.java b/integration-tests/smb/src/test/java/org/apache/camel/quarkus/component/smb/it/SmbIT.java new file mode 100644 index 0000000000..2c5f125938 --- /dev/null +++ b/integration-tests/smb/src/test/java/org/apache/camel/quarkus/component/smb/it/SmbIT.java @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.component.smb.it; + +import io.quarkus.test.junit.QuarkusIntegrationTest; + +@QuarkusIntegrationTest +class SmbIT extends SmbTest { + +} diff --git a/integration-tests/smb/src/test/java/org/apache/camel/quarkus/component/smb/it/SmbTest.java b/integration-tests/smb/src/test/java/org/apache/camel/quarkus/component/smb/it/SmbTest.java new file mode 100644 index 0000000000..e5f8aca62f --- /dev/null +++ b/integration-tests/smb/src/test/java/org/apache/camel/quarkus/component/smb/it/SmbTest.java @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.component.smb.it; + +import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.junit.QuarkusTest; +import io.restassured.RestAssured; +import org.junit.jupiter.api.Test; + +@QuarkusTest +@QuarkusTestResource(SmbTestResource.class) +public class SmbTest { + + @Test + public void testSmbResultsValidation() { + RestAssured.get("/smb/validate") + .then() + .statusCode(204); + } +} diff --git a/integration-tests/smb/src/test/java/org/apache/camel/quarkus/component/smb/it/SmbTestResource.java b/integration-tests/smb/src/test/java/org/apache/camel/quarkus/component/smb/it/SmbTestResource.java new file mode 100644 index 0000000000..35f0085a1a --- /dev/null +++ b/integration-tests/smb/src/test/java/org/apache/camel/quarkus/component/smb/it/SmbTestResource.java @@ -0,0 +1,61 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.component.smb.it; + +import java.util.Map; + +import io.quarkus.test.common.QuarkusTestResourceLifecycleManager; +import org.testcontainers.containers.GenericContainer; +import org.testcontainers.containers.wait.strategy.Wait; +import org.testcontainers.images.builder.ImageFromDockerfile; + +public class SmbTestResource implements QuarkusTestResourceLifecycleManager { + + private static final int SMB_PORT = 445; + + private GenericContainer<?> container; + + @Override + public Map<String, String> start() { + try { + container = new GenericContainer<>(new ImageFromDockerfile("localhost/samba:camel", false) + .withFileFromClasspath(".", "/")) + .withExposedPorts(SMB_PORT) + .waitingFor(Wait.forListeningPort()); + container.start(); + + String smbHost = container.getHost(); + int smbPort = container.getMappedPort(SMB_PORT); + + return Map.of( + "smb.host", smbHost, + "smb.port", Integer.toString(smbPort), + "smb.share", "data-rw", + "smb.username", "camel", + "smb.password", "camelTester123"); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Override + public void stop() { + if (container != null) { + container.stop(); + } + } +} diff --git a/integration-tests/smb/src/test/resources/Dockerfile b/integration-tests/smb/src/test/resources/Dockerfile new file mode 100644 index 0000000000..e6786f97c9 --- /dev/null +++ b/integration-tests/smb/src/test/resources/Dockerfile @@ -0,0 +1,25 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM fedora:38 as samba +ENV SAMBA_ROOT /opt/camel/samba +EXPOSE 139 445 +RUN dnf install -y samba && mkdir -p /data/rw /data/ro +ADD smb.conf /etc/samba/smb.conf +ADD start.sh /usr/local/bin +RUN chmod +x /usr/local/bin/start.sh +CMD /usr/local/bin/start.sh \ No newline at end of file diff --git a/integration-tests/smb/src/test/resources/smb.conf b/integration-tests/smb/src/test/resources/smb.conf new file mode 100644 index 0000000000..1cb1d83b57 --- /dev/null +++ b/integration-tests/smb/src/test/resources/smb.conf @@ -0,0 +1,61 @@ +# +# 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. +# + +[global] + workgroup = SAMBA + security = user + + passdb backend = tdbsam + + printing = cups + printcap name = cups + load printers = yes + cups options = raw + +[homes] + comment = Home Directories + valid users = %S, %D%w%S + browseable = No + read only = No + inherit acls = Yes + +[printers] + comment = All Printers + path = /var/tmp + printable = Yes + create mask = 0600 + browseable = No + +[print$] + comment = Printer Drivers + path = /var/lib/samba/drivers + write list = @printadmin root + force group = @printadmin + create mask = 0664 + directory mask = 0775 + +[data-rw] + comment = Read-write share for testing + path = /data/rw + read only = no + browsable = yes + +[data-ro] + comment = Read-only share for testing + path = /data/ro + read only = yes + browsable = yes \ No newline at end of file diff --git a/integration-tests/smb/src/test/resources/start.sh b/integration-tests/smb/src/test/resources/start.sh new file mode 100644 index 0000000000..2e1f950f65 --- /dev/null +++ b/integration-tests/smb/src/test/resources/start.sh @@ -0,0 +1,39 @@ +#!/bin/bash +# +# 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. +# + +echo "Creating read-writable files" +for file in $(seq 1 100) ; do + echo ${RANDOM} > /data/rw/${file}.txt ; +done + +echo "Creating read-only files" +for file in $(seq 1 100) ; do + echo ${RANDOM} > /data/ro/${file}.txt ; +done + +useradd camel +printf "camelTester123\ncamelTester123\n" | smbpasswd -s -a camel + +chown -Rv camel /data/rw + +nmbd -D +smbd -D -s /etc/samba/smb.conf + +while true ; do + sleep 10 +done \ No newline at end of file diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 0f6ba05436..33e2389153 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -2237,6 +2237,17 @@ <artifactId>camel-slack</artifactId> <version>${camel.version}</version> </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-smb</artifactId> + <version>${camel.version}</version> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-smpp</artifactId> @@ -5125,6 +5136,16 @@ <artifactId>camel-quarkus-smallrye-reactive-messaging-deployment</artifactId> <version>${camel-quarkus.version}</version> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-smb</artifactId> + <version>${camel-quarkus.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-smb-deployment</artifactId> + <version>${camel-quarkus.version}</version> + </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-smpp</artifactId> @@ -6062,11 +6083,6 @@ <artifactId>azure-core-http-vertx</artifactId> <version>${azure-core-http-vertx.version}</version> </dependency> - <dependency> - <groupId>com.esotericsoftware.kryo</groupId> - <artifactId>kryo</artifactId> - <version>${kryo.version}</version> - </dependency> <dependency> <groupId>com.box</groupId> <artifactId>box-java-sdk</artifactId> @@ -6078,6 +6094,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>com.esotericsoftware.kryo</groupId> + <artifactId>kryo</artifactId> + <version>${kryo.version}</version> + </dependency> <dependency> <groupId>com.github.java-json-tools</groupId> <artifactId>json-patch</artifactId> @@ -6896,9 +6917,9 @@ <version>${jedis-client.version}</version> </dependency> <dependency> - <groupId>software.amazon.awssdk.crt</groupId> - <artifactId>aws-crt</artifactId> - <version>${awscrt.version}</version> + <groupId>software.amazon.awssdk</groupId> + <artifactId>http-auth-aws</artifactId> + <version>${awssdk.version}</version> </dependency> <dependency> <groupId>software.amazon.awssdk</groupId> @@ -6906,9 +6927,9 @@ <version>${awssdk.version}</version> </dependency> <dependency> - <groupId>software.amazon.awssdk</groupId> - <artifactId>http-auth-aws</artifactId> - <version>${awssdk.version}</version> + <groupId>software.amazon.awssdk.crt</groupId> + <artifactId>aws-crt</artifactId> + <version>${awscrt.version}</version> </dependency> <dependency> <groupId>xalan</groupId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index a414561932..deddf866bf 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -2175,6 +2175,17 @@ <artifactId>camel-slack</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>4.3.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> + <dependency> + <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>camel-smb</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>4.3.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <exclusions> + <exclusion> + <groupId>junit</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>junit</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-smpp</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -5051,6 +5062,16 @@ <artifactId>camel-quarkus-smallrye-reactive-messaging-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>3.7.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>camel-quarkus-smb</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.7.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>camel-quarkus-smb-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.7.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-quarkus-smpp</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -5985,11 +6006,6 @@ <artifactId>azure-core-http-vertx</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>1.0.0-beta.3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> - <dependency> - <groupId>com.esotericsoftware.kryo</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>kryo</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>2.24.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - </dependency> <dependency> <groupId>com.box</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>box-java-sdk</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6001,6 +6017,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>com.esotericsoftware.kryo</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>kryo</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.24.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> <dependency> <groupId>com.github.java-json-tools</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>json-patch</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6819,9 +6840,9 @@ <version>5.0.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> - <groupId>software.amazon.awssdk.crt</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>aws-crt</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>0.29.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <groupId>software.amazon.awssdk</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>http-auth-aws</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.22.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>software.amazon.awssdk</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6829,9 +6850,9 @@ <version>2.22.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> - <groupId>software.amazon.awssdk</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>http-auth-aws</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>2.22.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <groupId>software.amazon.awssdk.crt</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>aws-crt</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>0.29.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>xalan</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 015c68273f..b1bb69f09c 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -2175,6 +2175,17 @@ <artifactId>camel-slack</artifactId> <version>4.3.0</version> </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-smb</artifactId> + <version>4.3.0</version> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-smpp</artifactId> @@ -5051,6 +5062,16 @@ <artifactId>camel-quarkus-smallrye-reactive-messaging-deployment</artifactId> <version>3.7.0-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-smb</artifactId> + <version>3.7.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-smb-deployment</artifactId> + <version>3.7.0-SNAPSHOT</version> + </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-smpp</artifactId> @@ -5985,11 +6006,6 @@ <artifactId>azure-core-http-vertx</artifactId> <version>1.0.0-beta.3</version> </dependency> - <dependency> - <groupId>com.esotericsoftware.kryo</groupId> - <artifactId>kryo</artifactId> - <version>2.24.0</version> - </dependency> <dependency> <groupId>com.box</groupId> <artifactId>box-java-sdk</artifactId> @@ -6001,6 +6017,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>com.esotericsoftware.kryo</groupId> + <artifactId>kryo</artifactId> + <version>2.24.0</version> + </dependency> <dependency> <groupId>com.github.java-json-tools</groupId> <artifactId>json-patch</artifactId> @@ -6719,9 +6740,9 @@ <version>5.0.2</version> </dependency> <dependency> - <groupId>software.amazon.awssdk.crt</groupId> - <artifactId>aws-crt</artifactId> - <version>0.29.1</version> + <groupId>software.amazon.awssdk</groupId> + <artifactId>http-auth-aws</artifactId> + <version>2.22.1</version> </dependency> <dependency> <groupId>software.amazon.awssdk</groupId> @@ -6729,9 +6750,9 @@ <version>2.22.1</version> </dependency> <dependency> - <groupId>software.amazon.awssdk</groupId> - <artifactId>http-auth-aws</artifactId> - <version>2.22.1</version> + <groupId>software.amazon.awssdk.crt</groupId> + <artifactId>aws-crt</artifactId> + <version>0.29.1</version> </dependency> <dependency> <groupId>xalan</groupId> diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index e21d1475d4..15c4e3f552 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -2175,6 +2175,17 @@ <artifactId>camel-slack</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>4.3.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> + <dependency> + <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>camel-smb</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>4.3.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <exclusions> + <exclusion> + <groupId>junit</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>junit</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-smpp</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -5051,6 +5062,16 @@ <artifactId>camel-quarkus-smallrye-reactive-messaging-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>3.7.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>camel-quarkus-smb</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.7.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>camel-quarkus-smb-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.7.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-quarkus-smpp</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -5985,11 +6006,6 @@ <artifactId>azure-core-http-vertx</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>1.0.0-beta.3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> - <dependency> - <groupId>com.esotericsoftware.kryo</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>kryo</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>2.24.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - </dependency> <dependency> <groupId>com.box</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>box-java-sdk</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6001,6 +6017,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>com.esotericsoftware.kryo</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>kryo</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.24.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> <dependency> <groupId>com.github.java-json-tools</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>json-patch</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6719,9 +6740,9 @@ <version>5.0.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> - <groupId>software.amazon.awssdk.crt</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>aws-crt</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>0.29.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <groupId>software.amazon.awssdk</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>http-auth-aws</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.22.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>software.amazon.awssdk</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6729,9 +6750,9 @@ <version>2.22.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> - <groupId>software.amazon.awssdk</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>http-auth-aws</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>2.22.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <groupId>software.amazon.awssdk.crt</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>aws-crt</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>0.29.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>xalan</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> diff --git a/tooling/scripts/test-categories.yaml b/tooling/scripts/test-categories.yaml index 55a040310d..1efecea2a9 100644 --- a/tooling/scripts/test-categories.yaml +++ b/tooling/scripts/test-categories.yaml @@ -179,6 +179,7 @@ group-11: - netty - qute - servlet + - smb - stringtemplate - tarfile - univocity-parsers