From a9f253209406f95d290057a7b53331c8e6bc8faf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Jan 2025 17:12:19 +0000 Subject: [PATCH 1/2] build(deps): bump dagger from 2.42 to 2.55 in /hiero-dependency-versions Bumps `dagger` from 2.42 to 2.55. Updates `com.google.dagger:dagger` from 2.42 to 2.55 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.42...dagger-2.55) Updates `com.google.dagger:dagger-compiler` from 2.42 to 2.55 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.42...dagger-2.55) --- updated-dependencies: - dependency-name: com.google.dagger:dagger dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.dagger:dagger-compiler dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- hiero-dependency-versions/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hiero-dependency-versions/build.gradle.kts b/hiero-dependency-versions/build.gradle.kts index 0f30a298ef3d..d4129b21045d 100644 --- a/hiero-dependency-versions/build.gradle.kts +++ b/hiero-dependency-versions/build.gradle.kts @@ -33,7 +33,7 @@ dependencies { val autoService = "1.1.1" val besu = "24.3.3" val bouncycastle = "1.79" -val dagger = "2.42" +val dagger = "2.55" val eclipseCollections = "11.1.0" val grpc = "1.69.0" val hederaCryptography = "0.1.1-SNAPSHOT" From 233b87ecd524f5938e116a2df38f471dd5aa9c23 Mon Sep 17 00:00:00 2001 From: Jendrik Johannes Date: Tue, 4 Feb 2025 11:51:27 +0100 Subject: [PATCH 2/2] fix: remove '\n' from classpath entries in currentNonTestClientClasspath Signed-off-by: Jendrik Johannes --- .../junit/hedera/subprocess/ProcessUtils.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/hedera/subprocess/ProcessUtils.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/hedera/subprocess/ProcessUtils.java index 79f38f198c67..5f0d8fcd44a5 100644 --- a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/hedera/subprocess/ProcessUtils.java +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/hedera/subprocess/ProcessUtils.java @@ -1,4 +1,19 @@ -// SPDX-License-Identifier: Apache-2.0 +/* + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC + * + * Licensed 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 com.hedera.services.bdd.junit.hedera.subprocess; import static com.hedera.services.bdd.junit.hedera.subprocess.ConditionStatus.REACHED; @@ -243,6 +258,7 @@ private static String currentNonTestClientClasspath() { throw new IllegalStateException("Cannot discover the classpath. Was --module-path used instead?"); } return Arrays.stream(classpath.split(":")) + .map(String::trim) // may have picked up a '\n' in the original classpath String .filter(s -> !s.contains("test-clients")) .collect(Collectors.joining(":")); }