This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch jnats-2.17.1 in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2d5c5b5cc8c1b0058a1ebd4ed06c02ad5e44b8fd Author: Andrea Cosentino <[email protected]> AuthorDate: Mon Nov 6 10:07:31 2023 +0100 Upgrade Jnats to version 2.17.1 and related Nats container to 2.10.4 Signed-off-by: Andrea Cosentino <[email protected]> --- .../nats/services/NatsLocalContainerService.java | 2 +- test-infra/camel-test-infra-smb/pom.xml | 32 ++++++++++++---------- .../test/infra/smb/services/SmbContainer.java | 2 -- .../camel/test/infra/smb/services/SmbService.java | 3 ++ .../apache/camel/test/infra/smb/services/smb.conf | 2 ++ 5 files changed, 23 insertions(+), 18 deletions(-) diff --git a/test-infra/camel-test-infra-nats/src/test/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerService.java b/test-infra/camel-test-infra-nats/src/test/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerService.java index 8bdc7651cff..e7adc036002 100644 --- a/test-infra/camel-test-infra-nats/src/test/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerService.java +++ b/test-infra/camel-test-infra-nats/src/test/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerService.java @@ -24,7 +24,7 @@ import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.wait.strategy.Wait; public class NatsLocalContainerService implements NatsService, ContainerService<GenericContainer> { - public static final String CONTAINER_IMAGE = "nats:2.10.1"; + public static final String CONTAINER_IMAGE = "nats:2.10.4"; public static final String CONTAINER_NAME = "nats"; private static final int PORT = 4222; diff --git a/test-infra/camel-test-infra-smb/pom.xml b/test-infra/camel-test-infra-smb/pom.xml index 997ba25a8b1..968393c3f8a 100644 --- a/test-infra/camel-test-infra-smb/pom.xml +++ b/test-infra/camel-test-infra-smb/pom.xml @@ -1,20 +1,22 @@ <?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. - --> + + 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"; diff --git a/test-infra/camel-test-infra-smb/src/test/java/org/apache/camel/test/infra/smb/services/SmbContainer.java b/test-infra/camel-test-infra-smb/src/test/java/org/apache/camel/test/infra/smb/services/SmbContainer.java index e8aaec79d56..b0981487a7e 100644 --- a/test-infra/camel-test-infra-smb/src/test/java/org/apache/camel/test/infra/smb/services/SmbContainer.java +++ b/test-infra/camel-test-infra-smb/src/test/java/org/apache/camel/test/infra/smb/services/SmbContainer.java @@ -36,7 +36,6 @@ public class SmbContainer extends GenericContainer<SmbContainer> { .waitingFor(Wait.forListeningPort()); } - public String getUser() { return DEFAULT_USER; } @@ -49,7 +48,6 @@ public class SmbContainer extends GenericContainer<SmbContainer> { return "data-rw"; } - public int getPort() { return getMappedPort(SMB_PORT_DEFAULT); } diff --git a/test-infra/camel-test-infra-smb/src/test/java/org/apache/camel/test/infra/smb/services/SmbService.java b/test-infra/camel-test-infra-smb/src/test/java/org/apache/camel/test/infra/smb/services/SmbService.java index 526e56a5f66..42e1bcc9e41 100644 --- a/test-infra/camel-test-infra-smb/src/test/java/org/apache/camel/test/infra/smb/services/SmbService.java +++ b/test-infra/camel-test-infra-smb/src/test/java/org/apache/camel/test/infra/smb/services/SmbService.java @@ -26,8 +26,11 @@ import org.slf4j.LoggerFactory; public interface SmbService extends TestService, BeforeTestExecutionCallback, AfterTestExecutionCallback { String address(); + String shareName(); + String userName(); + String password(); @Override diff --git a/test-infra/camel-test-infra-smb/src/test/resources/org/apache/camel/test/infra/smb/services/smb.conf b/test-infra/camel-test-infra-smb/src/test/resources/org/apache/camel/test/infra/smb/services/smb.conf index 74ef80abdda..1f1b14ac41c 100644 --- a/test-infra/camel-test-infra-smb/src/test/resources/org/apache/camel/test/infra/smb/services/smb.conf +++ b/test-infra/camel-test-infra-smb/src/test/resources/org/apache/camel/test/infra/smb/services/smb.conf @@ -1,3 +1,4 @@ +# # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with # this work for additional information regarding copyright ownership. @@ -12,6 +13,7 @@ # 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
