Skip to content

fix(spring): pom writer changes to adapt to repo structure changes in hosting repo #1141

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

Merged
zhumin8 merged 1 commit into from
Dec 21, 2022
Merged

fix(spring): pom writer changes to adapt to repo structure changes in hosting repo #1141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 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 @@ -208,7 +208,6 @@ static String buildPomString(GapicContext context) {
String clientLibraryShortName = Utils.getLibName(context);
String clientLibraryGroupId = "{{client-library-group-id}}";
String clientLibraryName = "{{client-library-artifact-id}}";
String clientLibraryVersion = "{{client-library-version}}";

String springStarterArtifactId = clientLibraryName + "-spring-starter";
String springStarterName = "Spring Boot Starter - " + clientLibraryShortName;
Expand All @@ -224,10 +223,12 @@ static String buildPomString(GapicContext context) {
+ "\n"
+ " <parent>\n"
+ " <groupId>com.google.cloud</groupId>\n"
+ " <artifactId>generated-parent</artifactId>\n"
+ " <artifactId>spring-cloud-gcp-starters</artifactId>\n"
+ " <version>%s</version>\n"
+ " <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>\n"
+ " </parent>\n"
+ " <artifactId>%s</artifactId>\n"
+ " <version>${project.parent.version}-preview</version>\n"
+ " <name>%s</name>\n"
+ " <description>Spring Boot Starter with AutoConfiguration for %s</description>\n"
+ "\n"
Expand All @@ -236,7 +237,6 @@ static String buildPomString(GapicContext context) {
+ " <dependency>\n"
+ " <groupId>%s</groupId>\n"
+ " <artifactId>%s</artifactId>\n"
+ " <version>%s</version>\n"
+ " </dependency>\n"
+ "\n"
+ " <dependency>\n"
Expand All @@ -256,8 +256,7 @@ static String buildPomString(GapicContext context) {
springStarterName,
clientLibraryShortName,
clientLibraryGroupId,
clientLibraryName,
clientLibraryVersion));
clientLibraryName));

return sb.toString();
}
Expand Down
5 changes: 3 additions & 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 @@ -5,10 +5,12 @@

<parent>
<groupId>com.google.cloud</groupId>
<artifactId>generated-parent</artifactId>
<artifactId>spring-cloud-gcp-starters</artifactId>
<version>{{parent-version}}</version>
<relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
</parent>
<artifactId>{{client-library-artifact-id}}-spring-starter</artifactId>
<version>${project.parent.version}-preview</version>
<name>Spring Boot Starter - localhost:7469</name>
<description>Spring Boot Starter with AutoConfiguration for localhost:7469</description>

Expand All @@ -17,7 +19,6 @@
<dependency>
<groupId>{{client-library-group-id}}</groupId>
<artifactId>{{client-library-artifact-id}}</artifactId>
<version>{{client-library-version}}</version>
</dependency>

<dependency>
Expand Down