Skip to content

Commit a497b69

Browse files
committed
chore: Resolve pom issues in IAM v3 generation
1 parent 99c50c8 commit a497b69

File tree

3 files changed

+43
-18
lines changed

3 files changed

+43
-18
lines changed

java-iam/grpc-google-iam-v3/pom.xml

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<name>grpc-google-iam-v3</name>
99
<description>GRPC library for proto-google-iam-v1</description>
1010
<parent>
11-
<groupId>com.google.api.grpc</groupId>
12-
<artifactId>proto-google-iam-v1-parent</artifactId>
11+
<groupId>com.google.cloud</groupId>
12+
<artifactId>google-iam-parent</artifactId>
1313
<version>1.50.2</version><!-- {x-version-update:proto-google-iam-v1:current} -->
1414
</parent>
1515
<dependencies>
@@ -42,4 +42,28 @@
4242
<artifactId>guava</artifactId>
4343
</dependency>
4444
</dependencies>
45+
46+
<profiles>
47+
<profile>
48+
<id>java9</id>
49+
<activation>
50+
<jdk>[9,)</jdk>
51+
</activation>
52+
<dependencies>
53+
<dependency>
54+
<groupId>javax.annotation</groupId>
55+
<artifactId>javax.annotation-api</artifactId>
56+
</dependency>
57+
</dependencies>
58+
</profile>
59+
</profiles>
60+
61+
<build>
62+
<plugins>
63+
<plugin>
64+
<groupId>org.codehaus.mojo</groupId>
65+
<artifactId>flatten-maven-plugin</artifactId>
66+
</plugin>
67+
</plugins>
68+
</build>
4569
</project>

java-iam/pom.xml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,6 @@
5454
<type>pom</type>
5555
<scope>import</scope>
5656
</dependency>
57-
<dependency>
58-
<groupId>com.google.api.grpc.api.grpc</groupId>
59-
<artifactId>proto-google-iam-v3</artifactId>
60-
<version>1.50.2</version><!-- {x-version-update:proto-google-iam-v3:current} -->
61-
</dependency>
62-
<dependency>
63-
<groupId>com.google.api.grpc.api.grpc</groupId>
64-
<artifactId>grpc-google-iam-v3</artifactId>
65-
<version>1.50.2</version><!-- {x-version-update:grpc-google-iam-v3:current} -->
66-
</dependency>
6757
<dependency>
6858
<groupId>com.google.guava</groupId>
6959
<artifactId>guava-bom</artifactId>
@@ -92,6 +82,11 @@
9282
<type>pom</type>
9383
<scope>import</scope>
9484
</dependency>
85+
<dependency>
86+
<groupId>com.google.api</groupId>
87+
<artifactId>api-common</artifactId>
88+
<version>2.47.2</version><!-- {x-version-update:api-common:current} -->
89+
</dependency>
9590
<dependency>
9691
<groupId>com.google.api.grpc</groupId>
9792
<artifactId>proto-google-iam-v2</artifactId>
@@ -127,6 +122,16 @@
127122
<artifactId>proto-google-iam-v1</artifactId>
128123
<version>1.50.2</version><!-- {x-version-update:proto-google-iam-v1:current} -->
129124
</dependency>
125+
<dependency>
126+
<groupId>com.google.api.grpc.api.grpc</groupId>
127+
<artifactId>proto-google-iam-v3</artifactId>
128+
<version>1.50.2</version><!-- {x-version-update:proto-google-iam-v3:current} -->
129+
</dependency>
130+
<dependency>
131+
<groupId>com.google.api.grpc.api.grpc</groupId>
132+
<artifactId>grpc-google-iam-v3</artifactId>
133+
<version>1.50.2</version><!-- {x-version-update:grpc-google-iam-v3:current} -->
134+
</dependency>
130135
<dependency>
131136
<groupId>javax.annotation</groupId>
132137
<artifactId>javax.annotation-api</artifactId>

java-iam/proto-google-iam-v3/pom.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<name>proto-google-iam-v3</name>
99
<description>Proto library for proto-google-iam-v1</description>
1010
<parent>
11-
<groupId>com.google.api.grpc</groupId>
12-
<artifactId>proto-google-iam-v1-parent</artifactId>
11+
<groupId>com.google.cloud</groupId>
12+
<artifactId>google-iam-parent</artifactId>
1313
<version>1.50.2</version><!-- {x-version-update:proto-google-iam-v1:current} -->
1414
</parent>
1515
<dependencies>
@@ -21,10 +21,6 @@
2121
<groupId>com.google.api.grpc</groupId>
2222
<artifactId>proto-google-common-protos</artifactId>
2323
</dependency>
24-
<dependency>
25-
<groupId>com.google.api.grpc</groupId>
26-
<artifactId>proto-google-iam-v1</artifactId>
27-
</dependency>
2824
<dependency>
2925
<groupId>com.google.api</groupId>
3026
<artifactId>api-common</artifactId>

0 commit comments

Comments
 (0)