Skip to content
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

don't override maven-resources-plugin #26408

Merged
merged 2 commits into from
Jun 11, 2024
Merged

don't override maven-resources-plugin #26408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b33d4b4
adjust to from-issue
mshima Jun 11, 2024
d89f7c1
don't override maven-resources-plugin
mshima Jun 11, 2024
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
2 changes: 1 addition & 1 deletion .blueprint/from-issue/generator.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export default class extends BaseGenerator {
}

setGithubTaskOutput(ENTITIES_JDL_OUTPUT, this.data.jdlEntitiesDefinitions ? VALID : BLANK);
setGithubTaskOutput(CONTAINS_SAMPLE, Boolean(this.data.yoRcContent && this.data.jdlEntitiesDefinitions));
setGithubTaskOutput(CONTAINS_SAMPLE, Boolean(this.data.jdlDefinitions || this.data.yoRcContent));
setGithubTaskOutput(VALID_OUTPUT, this.data.yoRcValid);

for (const file of await prepareSample(this.projectFolder, this.data.files)) {
Expand Down
2 changes: 1 addition & 1 deletion generators/server/templates/gradle/profile_dev.gradle.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion generators/server/templates/gradle/profile_prod.gradle.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
26 changes: 0 additions & 26 deletions generators/server/templates/pom.xml.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion generators/server/templates/src/main/resources/config/application-dev.yml.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:}
Expand Down
2 changes: 1 addition & 1 deletion generators/server/templates/src/main/resources/config/application.yml.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:}
Expand Down
2 changes: 1 addition & 1 deletion generators/server/templates/src/main/resources/config/bootstrap.yml.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:}
Expand Down
Loading