From d67d842da4d45a4e2110beec2a3343e9922e7e68 Mon Sep 17 00:00:00 2001 From: wxq Date: Thu, 25 Feb 2021 09:23:04 +0800 Subject: [PATCH] dashboard: Use delimiter '@' only in maven-resources-plugin config of dashboard pom (#2046) `${user.home}` should be resolve in dashboard runtime, not in maven package goal --- sentinel-dashboard/pom.xml | 15 +++++++++++++++ .../src/main/resources/application.properties | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/sentinel-dashboard/pom.xml b/sentinel-dashboard/pom.xml index bf3291e1..43cb16d5 100755 --- a/sentinel-dashboard/pom.xml +++ b/sentinel-dashboard/pom.xml @@ -13,6 +13,7 @@ jar + @ 2.0.5.RELEASE 4.0.1 @@ -138,6 +139,20 @@ sentinel-dashboard + + + + org.apache.maven.plugins + maven-resources-plugin + + + ${resource.delimiter} + + false + + + + org.springframework.boot diff --git a/sentinel-dashboard/src/main/resources/application.properties b/sentinel-dashboard/src/main/resources/application.properties index b9e026c9..20ae4010 100755 --- a/sentinel-dashboard/src/main/resources/application.properties +++ b/sentinel-dashboard/src/main/resources/application.properties @@ -21,4 +21,4 @@ auth.password=sentinel # Inject the dashboard version. It's required to enable # filtering in pom.xml for this resource file. -sentinel.dashboard.version=${project.version} \ No newline at end of file +sentinel.dashboard.version=@project.version@ \ No newline at end of file