Skip to content

build: use Scala 3 compatible lift persistence #2908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hongwei1 wants to merge 1 commit into from
Closed

build: use Scala 3 compatible lift persistence #2908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions flushall_build_and_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,14 @@ if [ "$RUN_BACKGROUND" = true ]; then
# via `out=$(./flushall_build_and_run.sh --background ...)` never sees EOF
# — the substitution hangs forever, since the server (and thus the tee
# process backing the substitution) never exits on its own.
nohup java $JAVA_OPTS -jar obp-api/target/obp-api.jar > "$RUNTIME_LOG" 2>&1 &
env \
OBP_CONNECTOR="${OBP_CONNECTOR:-star}" \
OBP_HOSTNAME="${OBP_HOSTNAME:-http://localhost:8080}" \
OBP_STARCONNECTOR_SUPPORTED_TYPES="${OBP_STARCONNECTOR_SUPPORTED_TYPES:-mapped,internal,cardano_vJun2025}" \
OBP_BERLIN_GROUP_MANDATORY_HEADERS="${OBP_BERLIN_GROUP_MANDATORY_HEADERS:-}" \
OBP_BERLIN_GROUP_MANDATORY_HEADER_CONSENT="${OBP_BERLIN_GROUP_MANDATORY_HEADER_CONSENT:-}" \
OBP_API_INSTANCE_ID="${OBP_API_INSTANCE_ID:-local}" \
nohup java $JAVA_OPTS -jar obp-api/target/obp-api.jar > "$RUNTIME_LOG" 2>&1 &
SERVER_PID=$!
# Report the port the server will actually bind (dev.port in props), so callers
# that capture this script's output (e.g. smoke_test.sh) can parse it out.
Expand All @@ -199,5 +206,12 @@ else
echo "Press Ctrl+C to stop the server"
echo "Runtime log also written to: $RUNTIME_LOG"
echo ""
java $JAVA_OPTS -jar obp-api/target/obp-api.jar 2>&1 | tee "$RUNTIME_LOG"
env \
OBP_CONNECTOR="${OBP_CONNECTOR:-star}" \
OBP_HOSTNAME="${OBP_HOSTNAME:-http://localhost:8080}" \
OBP_STARCONNECTOR_SUPPORTED_TYPES="${OBP_STARCONNECTOR_SUPPORTED_TYPES:-mapped,internal,cardano_vJun2025}" \
OBP_BERLIN_GROUP_MANDATORY_HEADERS="${OBP_BERLIN_GROUP_MANDATORY_HEADERS:-}" \
OBP_BERLIN_GROUP_MANDATORY_HEADER_CONSENT="${OBP_BERLIN_GROUP_MANDATORY_HEADER_CONSENT:-}" \
OBP_API_INSTANCE_ID="${OBP_API_INSTANCE_ID:-local}" \
java $JAVA_OPTS -jar obp-api/target/obp-api.jar 2>&1 | tee "$RUNTIME_LOG"
fi
18 changes: 16 additions & 2 deletions flushall_fast_build_and_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,14 @@ JAVA_OPTS="--add-opens java.base/java.lang=ALL-UNNAMED \

if [ "$RUN_BACKGROUND" = true ]; then
# Run in background with output to log file
nohup java $JAVA_OPTS -jar obp-api/target/obp-api.jar > http4s-server.log 2>&1 &
env \
OBP_CONNECTOR="${OBP_CONNECTOR:-star}" \
OBP_HOSTNAME="${OBP_HOSTNAME:-http://localhost:8080}" \
OBP_STARCONNECTOR_SUPPORTED_TYPES="${OBP_STARCONNECTOR_SUPPORTED_TYPES:-mapped,internal,cardano_vJun2025}" \
OBP_BERLIN_GROUP_MANDATORY_HEADERS="${OBP_BERLIN_GROUP_MANDATORY_HEADERS:-}" \
OBP_BERLIN_GROUP_MANDATORY_HEADER_CONSENT="${OBP_BERLIN_GROUP_MANDATORY_HEADER_CONSENT:-}" \
OBP_API_INSTANCE_ID="${OBP_API_INSTANCE_ID:-local}" \
nohup java $JAVA_OPTS -jar obp-api/target/obp-api.jar > http4s-server.log 2>&1 &
SERVER_PID=$!
# Report the port the server will actually bind (dev.port in props), so callers
# that capture this script's output (e.g. smoke_test.sh) can parse it out.
Expand All @@ -387,7 +394,14 @@ else
# Run in foreground (Ctrl+C to stop)
echo "Press Ctrl+C to stop the server"
echo ""
java $JAVA_OPTS -jar obp-api/target/obp-api.jar
env \
OBP_CONNECTOR="${OBP_CONNECTOR:-star}" \
OBP_HOSTNAME="${OBP_HOSTNAME:-http://localhost:8080}" \
OBP_STARCONNECTOR_SUPPORTED_TYPES="${OBP_STARCONNECTOR_SUPPORTED_TYPES:-mapped,internal,cardano_vJun2025}" \
OBP_BERLIN_GROUP_MANDATORY_HEADERS="${OBP_BERLIN_GROUP_MANDATORY_HEADERS:-}" \
OBP_BERLIN_GROUP_MANDATORY_HEADER_CONSENT="${OBP_BERLIN_GROUP_MANDATORY_HEADER_CONSENT:-}" \
OBP_API_INSTANCE_ID="${OBP_API_INSTANCE_ID:-local}" \
java $JAVA_OPTS -jar obp-api/target/obp-api.jar
fi

################################################################################
Expand Down
16 changes: 8 additions & 8 deletions obp-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,20 @@
<version>1.5.18</version>
</dependency>
<dependency>
<groupId>com.github.OpenBankProject.lift-persistence</groupId>
<groupId>net.liftweb</groupId>
<artifactId>lift-persistence_${scala.version}</artifactId>
</dependency>
<dependency>
<groupId>org.json4s</groupId>
<artifactId>json4s-native_${scala.version}</artifactId>
</dependency>
<!-- for LiftConsole -->
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-compiler</artifactId>
<version>${scala.compiler}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
Expand Down Expand Up @@ -198,13 +205,6 @@
<artifactId>elasticsearch-rest-client</artifactId>
<version>8.19.12</version>
</dependency>
<!-- for LiftConsole -->
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-compiler</artifactId>
<version>${scala.compiler}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion obp-commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<dependencies>
<dependency>
<groupId>com.github.OpenBankProject.lift-persistence</groupId>
<groupId>net.liftweb</groupId>
<artifactId>lift-persistence_${scala.version}</artifactId>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<!-- v1.0.5 is the first tag published for both Scala versions. Up to v1.0.4 JitPack ran its
default `sbt clean publishM2`, which publishes only the default Scala version, so
lift-persistence_2.13 did not exist however the tag was numbered. -->
<lift.version>v1.0.5</lift.version>
<lift.version>3.5.0-lift-persistence-dev-20260903</lift.version>
<http4s.version>0.23.30</http4s.version>
<!-- Common plugin settings -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -178,7 +178,7 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.github.OpenBankProject.lift-persistence</groupId>
<groupId>net.liftweb</groupId>
<artifactId>lift-persistence_${scala.version}</artifactId>
<version>${lift.version}</version>
</dependency>
Expand Down
15 changes: 14 additions & 1 deletion run_tests_parallel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,19 @@ run_shard() {
OBP_HOSTNAME="http://localhost:${port}" \
OBP_HTTP4S_TEST_PORT="${http4s_port}" \
OBP_MAIL_TEST_MODE="true" \
OBP_ALLOW_SANDBOX_DATA_IMPORT="true" \
OBP_TRANSACTIONREQUESTS_ENABLED="true" \
OBP_ALLOW_PUBLIC_VIEWS="true" \
OBP_CONSENTS_ALLOWED="true" \
OBP_BERLIN_GROUP_V1_3_ALIAS_PATH="0.6/v1" \
OBP_ALLOWED_INTERNAL_REDIRECT_URLS="/,/oauth/authorize" \
OBP_RESETPASSWORDURLENABLED="true" \
OBP_SIMPLE_OTP_INSTRUCTION_TRANSPORT="dummy" \
OBP_ACCOUNT_OTP_INSTRUCTION_TRANSPORT="dummy" \
OBP_SEPA_OTP_INSTRUCTION_TRANSPORT="dummy" \
OBP_FREE_FORM_OTP_INSTRUCTION_TRANSPORT="dummy" \
OBP_COUNTERPARTY_OTP_INSTRUCTION_TRANSPORT="dummy" \
OBP_SEPA_CREDIT_TRANSFERS_OTP_INSTRUCTION_TRANSPORT="dummy" \
OBP_DYNAMIC_CODE_SANDBOX_PERMISSIONS='[new java.net.NetPermission("specifyStreamHandler"), new java.lang.reflect.ReflectPermission("suppressAccessChecks"), new java.lang.RuntimePermission("getenv.*"), new java.lang.RuntimePermission("accessDeclaredMembers"), new java.lang.RuntimePermission("getClassLoader")]' \
OBP_ALLOW_USER_GENERATED_SCALA_CODE="true" \
OBP_API_INSTANCE_ID="shard_${n}_${port}" \
Expand Down Expand Up @@ -579,4 +592,4 @@ else
echo "FAIL" > test-results/parallel/RESULT
fi

exit $OVERALL_RC
exit $OVERALL_RC
Loading