diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index a3c407f..e193f5b 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,4 +1,4 @@ wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip -distributionSha256Sum=5af3b743dd8b876b5c45da33b676251e5f1687712644abb4ee519ca56e1d89ce +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.10.0/apache-maven-3.10.0-bin.zip +distributionSha256Sum=1f6d9909266510f039f59aa0e13dcd2c66da85f043e56276e41f2918f8bddaff diff --git a/scripts/run-conformance-adapter.sh b/scripts/run-conformance-adapter.sh index 0270ccb..aec646d 100755 --- a/scripts/run-conformance-adapter.sh +++ b/scripts/run-conformance-adapter.sh @@ -1,8 +1,18 @@ #!/bin/sh set -eu -exec ./mvnw --quiet --batch-mode --no-transfer-progress \ +classpath_file=$(mktemp) +trap 'rm -f "$classpath_file"' EXIT INT TERM + +./mvnw --quiet --batch-mode --no-transfer-progress \ -f tools/odp-conformance/pom.xml \ - -Dexec.mainClass=org.offeringprotocol.odp.conformance.ConformanceAdapter \ - -Dexec.classpathScope=runtime \ - org.codehaus.mojo:exec-maven-plugin:3.6.3:java + -DincludeScope=runtime \ + -Dmdep.outputFile="$classpath_file" \ + dependency:build-classpath < /dev/null >&2 +classpath=$(cat "$classpath_file") +rm -f "$classpath_file" +trap - EXIT INT TERM + +exec "${JAVA_HOME:+$JAVA_HOME/bin/}java" \ + -cp "tools/odp-conformance/target/classes:$classpath" \ + org.offeringprotocol.odp.conformance.ConformanceAdapter