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

fix(spring): fix write pom placeholders. #1099

Merged
merged 2 commits into from
Nov 23, 2022
Merged

fix(spring): fix write pom placeholders. #1099

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
aac62bc
fix(spring): remove starter-version placeholder. remove redundant gro…
zhumin8 Nov 21, 2022
bd9afaf
fix(spring): add parent version to pom string.
zhumin8 Nov 21, 2022
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
7 changes: 3 additions & 4 deletions src/main/java/com/google/api/generator/spring/SpringWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ static String buildPomString(GapicContext context) {
String clientLibraryVersion = "{{client-library-version}}";

String springStarterArtifactId = clientLibraryName + "-spring-starter";
String springStarterVersion = "{{starter-version}}";
String springStarterName = "Spring Boot Starter - " + clientLibraryShortName;
String springParentVersion = "{{parent-version}}";

StringJoiner sb = new StringJoiner(",\\\n");
sb.add(
Expand All @@ -225,10 +225,9 @@ static String buildPomString(GapicContext context) {
+ " <parent>\n"
+ " <groupId>com.google.cloud</groupId>\n"
+ " <artifactId>generated-parent</artifactId>\n"
+ " <version>%s</version>\n"
+ " </parent>\n"
+ " <groupId>com.google.cloud</groupId>\n"
+ " <artifactId>%s</artifactId>\n"
+ " <version>%s</version>\n"
+ " <name>%s</name>\n"
+ " <description>Spring Boot Starter with AutoConfiguration for %s</description>\n"
+ "\n"
Expand All @@ -254,8 +253,8 @@ static String buildPomString(GapicContext context) {
+ "</dependencies>\n"
+ "\n"
+ "</project>",
springParentVersion,
springStarterArtifactId,
springStarterVersion,
springStarterName,
clientLibraryShortName,
clientLibraryGroupId,
Expand Down
3 changes: 1 addition & 2 deletions src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>generated-parent</artifactId>
<version>{{parent-version}}</version>
</parent>
<groupId>com.google.cloud</groupId>
<artifactId>{{client-library-artifact-id}}-spring-starter</artifactId>
<version>{{starter-version}}</version>
<name>Spring Boot Starter - localhost:7469</name>
<description>Spring Boot Starter with AutoConfiguration for localhost:7469</description>

Expand Down