This is an automated email from the ASF dual-hosted git repository.
zrlw pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/dubbo-integration-cases.git
The following commit(s) were added to refs/heads/main by this push:
new d2432e1a Copy dependencies for multiple model project (#82)
d2432e1a is described below
commit d2432e1a3f38700730e1f87458b4487b2386e146
Author: zrlw <[email protected]>
AuthorDate: Wed Nov 12 13:07:00 2025 +0800
Copy dependencies for multiple model project (#82)
* Revert adding jctools-core.jar
* Output all dependencies to the same directory for multiple-module project
---
test/dubbo-test-runner/build.sh | 1 -
test/dubbo-test-runner/src/docker/Dockerfile | 2 +-
test/dubbo-test-runner/src/docker/run-dubbo-app.sh | 2 +-
test/dubbo-test-runner/src/docker/run-dubbo-test.sh | 2 +-
test/run-tests.sh | 3 ++-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/test/dubbo-test-runner/build.sh b/test/dubbo-test-runner/build.sh
index 3ba254d3..5ee631f0 100755
--- a/test/dubbo-test-runner/build.sh
+++ b/test/dubbo-test-runner/build.sh
@@ -21,5 +21,4 @@ cp -r $DIR/src/docker/* $DOCKER_DIR/
cp $DIR/target/dubbo-test-runner-*-jar-with-dependencies.jar
$DOCKER_DIR/dubbo-test-runner.jar
cd $DOCKER_DIR
-wget
https://repo1.maven.org/maven2/org/jctools/jctools-core/4.0.5/jctools-core-4.0.5.jar
-O jctools-core.jar
docker build -t dubbo/sample-test:$JAVA_VER . --build-arg
DEBIAN_MIRROR=$DEBIAN_MIRROR --build-arg JAVA_VER=$JAVA_VER
diff --git a/test/dubbo-test-runner/src/docker/Dockerfile
b/test/dubbo-test-runner/src/docker/Dockerfile
index a4a6dd17..b9feec45 100644
--- a/test/dubbo-test-runner/src/docker/Dockerfile
+++ b/test/dubbo-test-runner/src/docker/Dockerfile
@@ -64,7 +64,7 @@ ENV JAVA_OPTS="" \
TEST_PATTERNS="**/*IT.class"
-ADD dubbo-test-runner.jar *.sh jctools-core.jar /usr/local/dubbo/
+ADD dubbo-test-runner.jar *.sh /usr/local/dubbo/
WORKDIR /usr/local/dubbo/
#ENTRYPOINT exec java $JAVA_OPTS -jar dubbo-test-runner.jar $TEST_CLASSES_DIR
$APP_CLASSES_DIR $APP_DEPENDENCY_DIR
diff --git a/test/dubbo-test-runner/src/docker/run-dubbo-app.sh
b/test/dubbo-test-runner/src/docker/run-dubbo-app.sh
index 40d2d9cc..04c92b7b 100755
--- a/test/dubbo-test-runner/src/docker/run-dubbo-app.sh
+++ b/test/dubbo-test-runner/src/docker/run-dubbo-app.sh
@@ -29,7 +29,7 @@ fi
echo "Running app : [$APP_MAIN_CLASS] ..."
start=$SECONDS
-java -server $JAVA_OPTS $DEBUG_OPTS -cp
"$APP_CLASSES_DIR:$APP_DEPENDENCY_DIR/*:$APP_CLASSES_DIR/../../jctools-core.jar"
$APP_MAIN_CLASS 2>&1 &
+java -server $JAVA_OPTS $DEBUG_OPTS -cp
"$APP_CLASSES_DIR:$APP_DEPENDENCY_DIR/*" $APP_MAIN_CLASS 2>&1 &
pid=$!
echo "Wait for process to exit: $pid .."
diff --git a/test/dubbo-test-runner/src/docker/run-dubbo-test.sh
b/test/dubbo-test-runner/src/docker/run-dubbo-test.sh
index 95c9abbc..100767d7 100755
--- a/test/dubbo-test-runner/src/docker/run-dubbo-test.sh
+++ b/test/dubbo-test-runner/src/docker/run-dubbo-test.sh
@@ -40,7 +40,7 @@ report_dir=$DIR/app/test-reports
# Fix Class loading problem in java9+: CompletableFuture.supplyAsync() is
executed in the ForkJoinWorkerThread
# and it only uses system classloader to load classes instead of the
IsolatedClassLoader
-classpath=dubbo-test-runner.jar:$TEST_CLASSES_DIR:$APP_CLASSES_DIR:$APP_DEPENDENCY_DIR/*:$APP_CLASSES_DIR/../../jctools-core.jar
+classpath=dubbo-test-runner.jar:$TEST_CLASSES_DIR:$APP_CLASSES_DIR:$APP_DEPENDENCY_DIR/*
java -server $JAVA_OPTS $DEBUG_OPTS -cp $classpath
org.apache.dubbo.test.runner.TestRunnerMain "$TEST_CLASSES_DIR"
"$APP_CLASSES_DIR" "$APP_DEPENDENCY_DIR" "$report_dir" "$TEST_PATTERNS" 2>&1
result=$?
if [ $result -ne 0 ]; then
diff --git a/test/run-tests.sh b/test/run-tests.sh
index e3e92ec1..1bccd262 100755
--- a/test/run-tests.sh
+++ b/test/run-tests.sh
@@ -191,7 +191,8 @@ function process_case() {
find . -name target -d | xargs -I {} sudo rm -rf {}
fi
- mvn $BUILD_OPTS $version_profile &> $project_home/mvn.log
+ # output all dependencies to the same directory (each module of multiple
module project has its own dependency output directory by default)
+ mvn $BUILD_OPTS $version_profile
-DoutputDirectory=$project_home/target/dependency &> $project_home/mvn.log
result=$?
if [ $result -ne 0 ]; then
echo "$log_prefix $TEST_FAILURE: Build failure with version:
$version_profile, please check log: $project_home/mvn.log" | tee -a
$testResultFile
