don't override maven-resources-plugin

jhipster · Jun 11, 2024 · d89f7c1 · d89f7c1
1 parent b33d4b4
commit d89f7c1
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 31 deletions.
diff --git a/generators/server/templates/gradle/profile_dev.gradle.ejs b/generators/server/templates/gradle/profile_dev.gradle.ejs
@@ -163,7 +163,7 @@ processResources {
     inputs.property('springProfiles', springProfiles)
     filesMatching("**/application.yml") {
         filter {
-            it.replace("#project.version#", version)
+            it.replace("@project.version@", version)
         }
 <%_ if (!serviceDiscoveryAny) { _%>
         filter {

diff --git a/generators/server/templates/gradle/profile_prod.gradle.ejs b/generators/server/templates/gradle/profile_prod.gradle.ejs
@@ -98,7 +98,7 @@ processResources {
     inputs.property('springProfiles', springProfiles)
     filesMatching("**/application.yml") {
         filter {
-            it.replace("#project.version#", version)
+            it.replace("@project.version@", version)
         }
 <%_ if (!serviceDiscoveryAny) { _%>
         filter {

diff --git a/generators/server/templates/pom.xml.ejs b/generators/server/templates/pom.xml.ejs
@@ -490,32 +490,6 @@
                         </rules>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>${maven-resources-plugin.version}</version>
-                    <executions>
-                        <execution>
-                            <id>config-resources</id>
-                            <phase>validate</phase>
-                            <goals>
-                                <goal>copy-resources</goal>
-                            </goals>
-                            <configuration>
-                                <outputDirectory>${project.build.directory}/classes</outputDirectory>
-                                <resources>
-                                    <resource>
-                                        <directory><%= SERVER_MAIN_RES_DIR %></directory>
-                                        <filtering>true</filtering>
-                                        <includes>
-                                            <include>config/*.yml</include>
-                                        </includes>
-                                    </resource>
-                                </resources>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>

diff --git a/generators/server/templates/src/main/resources/config/application-dev.yml.ejs b/generators/server/templates/src/main/resources/config/application-dev.yml.ejs
@@ -111,7 +111,7 @@ spring:
         prefer-ip-address: true
         tags:
           - profile=${spring.profiles.active}
-          - version=#project.version#
+          - version='@project.version@'
           - git-version=${git.commit.id.describe:}
           - git-commit=${git.commit.id.abbrev:}
           - git-branch=${git.branch:}

diff --git a/generators/server/templates/src/main/resources/config/application.yml.ejs b/generators/server/templates/src/main/resources/config/application.yml.ejs
@@ -63,7 +63,7 @@ eureka:
     metadata-map:
       zone: primary # This is needed for the load balancer
       profile: ${spring.profiles.active}
-      version: #project.version#
+      version: '@project.version@'
       git-version: ${git.commit.id.describe:}
       git-commit: ${git.commit.id.abbrev:}
       git-branch: ${git.branch:}

diff --git a/generators/server/templates/src/main/resources/config/bootstrap.yml.ejs b/generators/server/templates/src/main/resources/config/bootstrap.yml.ejs
@@ -41,7 +41,7 @@ spring:
       discovery:
         tags:
           - profile=${spring.profiles.active}
-          - version=#project.version#
+          - version='@project.version@'
           - git-version=${git.commit.id.describe:}
           - git-commit=${git.commit.id.abbrev:}
           - git-branch=${git.branch:}