Merge pull request #25980 from timothystone/fix/spring-profiles-active

build(generator): default maven-resources-plugin to the spring-boot-parent definition
jhipster · Apr 29, 2024 · 0db3cbe · 0db3cbe
2 parents 9690e42 + 117f154
commit 0db3cbe
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/generators/server/templates/gradle/profile_dev.gradle.ejs b/generators/server/templates/gradle/profile_dev.gradle.ejs
@@ -167,14 +167,14 @@ processResources {
         }
 <%_ if (!serviceDiscoveryAny) { _%>
         filter {
-            it.replace("#spring.profiles.active#", springProfiles)
+            it.replace("@spring.profiles.active@", springProfiles)
         }
 <%_ } _%>
     }
 <%_ if (serviceDiscoveryEureka || serviceDiscoveryConsul) { _%>
     filesMatching("**/bootstrap.yml") {
         filter {
-            it.replace("#spring.profiles.active#", springProfiles)
+            it.replace("@spring.profiles.active@", springProfiles)
         }
     }
 <%_ } _%>

diff --git a/generators/server/templates/gradle/profile_prod.gradle.ejs b/generators/server/templates/gradle/profile_prod.gradle.ejs
@@ -102,14 +102,14 @@ processResources {
         }
 <%_ if (!serviceDiscoveryAny) { _%>
         filter {
-            it.replace("#spring.profiles.active#", springProfiles)
+            it.replace("@spring.profiles.active@", springProfiles)
         }
 <%_ } _%>
     }
 <%_ if (serviceDiscoveryEureka || serviceDiscoveryConsul) { _%>
     filesMatching("**/bootstrap.yml") {
         filter {
-            it.replace("#spring.profiles.active#", springProfiles)
+            it.replace("@spring.profiles.active@", springProfiles)
         }
     }
 <%_ } _%>

diff --git a/generators/server/templates/pom.xml.ejs b/generators/server/templates/pom.xml.ejs
@@ -501,10 +501,6 @@
                             </goals>
                             <configuration>
                                 <outputDirectory>${project.build.directory}/classes</outputDirectory>
-                                <useDefaultDelimiters>false</useDefaultDelimiters>
-                                <delimiters>
-                                    <delimiter>#</delimiter>
-                                </delimiters>
                                 <resources>
                                     <resource>
                                         <directory><%= SERVER_MAIN_RES_DIR %></directory>

diff --git a/generators/server/templates/src/main/resources/config/application.yml.ejs b/generators/server/templates/src/main/resources/config/application.yml.ejs
@@ -245,7 +245,7 @@ spring:
     # The commented value for `active` can be replaced with valid Spring profiles to load.
     # Otherwise, it will be filled in by <%= buildTool %> when building the JAR file
     # Either way, it can be overridden by `--spring.profiles.active` value passed in the commandline or `-Dspring.profiles.active` set in `JAVA_OPTS`
-    active: #spring.profiles.active#
+    active: '@spring.profiles.active@'
     group:
       dev:
         - dev

diff --git a/generators/server/templates/src/main/resources/config/bootstrap.yml.ejs b/generators/server/templates/src/main/resources/config/bootstrap.yml.ejs
@@ -30,7 +30,7 @@ spring:
     # The commented value for `active` can be replaced with valid Spring profiles to load.
     # Otherwise, it will be filled in by <%= buildTool %> when building the JAR file
     # Either way, it can be overridden by `--spring.profiles.active` value passed in the commandline or `-Dspring.profiles.active` set in `JAVA_OPTS`
-    active: #spring.profiles.active#
+    active: '@spring.profiles.active@'
   cloud:
 <%_ if (serviceDiscoveryConsul) { _%>
     consul: