Browse Source

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
master
wxq GitHub 3 years ago
parent
commit
d67d842da4
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
  1. +15
    -0
      sentinel-dashboard/pom.xml
  2. +1
    -1
      sentinel-dashboard/src/main/resources/application.properties

+ 15
- 0
sentinel-dashboard/pom.xml View File

@@ -13,6 +13,7 @@
<packaging>jar</packaging>

<properties>
<resource.delimiter>@</resource.delimiter>
<spring.boot.version>2.0.5.RELEASE</spring.boot.version>
<curator.version>4.0.1</curator.version>
</properties>
@@ -138,6 +139,20 @@

<build>
<finalName>sentinel-dashboard</finalName>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<delimiters>
<delimiter>${resource.delimiter}</delimiter>
</delimiters>
<useDefaultDelimiters>false</useDefaultDelimiters>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>


+ 1
- 1
sentinel-dashboard/src/main/resources/application.properties View File

@@ -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}
sentinel.dashboard.version=@project.version@

Loading…
Cancel
Save