Skip to content

Commit 251fefc

Browse files
suztomosuztomo
committed
Flattening the content of gax-bom in gapic-generator-java-bom
1 parent 44cf375 commit 251fefc

1 file changed

Lines changed: 54 additions & 3 deletions

File tree

‎gapic-generator-java-bom/pom.xml‎

Lines changed: 54 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,64 @@
7777
<artifactId>api-common</artifactId>
7878
<version>2.50.1</version><!-- {x-version-update:api-common:current} -->
7979
</dependency>
80+
81+
<!-- Copying the content of gax-bom to untagle the circular dependencies of com.google.cloud and com.google.api -->
8082
<dependency>
8183
<groupId>com.google.api</groupId>
82-
<artifactId>gax-bom</artifactId>
84+
<artifactId>gax</artifactId>
8385
<version>2.67.1</version><!-- {x-version-update:gax:current} -->
84-
<type>pom</type>
85-
<scope>import</scope>
8686
</dependency>
87+
<dependency>
88+
<groupId>com.google.api</groupId>
89+
<artifactId>gax</artifactId>
90+
<version>2.67.1</version><!-- {x-version-update:gax:current} -->
91+
<type>test-jar</type>
92+
<classifier>testlib</classifier>
93+
</dependency>
94+
<dependency>
95+
<groupId>com.google.api</groupId>
96+
<artifactId>gax</artifactId>
97+
<version>2.67.1</version><!-- {x-version-update:gax:current} -->
98+
<classifier>testlib</classifier>
99+
</dependency>
100+
<dependency>
101+
<groupId>com.google.api</groupId>
102+
<artifactId>gax-grpc</artifactId>
103+
<version>2.67.1</version><!-- {x-version-update:gax-grpc:current} -->
104+
</dependency>
105+
<dependency>
106+
<groupId>com.google.api</groupId>
107+
<artifactId>gax-grpc</artifactId>
108+
<version>2.67.1</version><!-- {x-version-update:gax-grpc:current} -->
109+
<type>test-jar</type>
110+
<classifier>testlib</classifier>
111+
</dependency>
112+
<dependency>
113+
<groupId>com.google.api</groupId>
114+
<artifactId>gax-grpc</artifactId>
115+
<version>2.67.1</version><!-- {x-version-update:gax-grpc:current} -->
116+
<classifier>testlib</classifier>
117+
</dependency>
118+
<dependency>
119+
<groupId>com.google.api</groupId>
120+
<artifactId>gax-httpjson</artifactId>
121+
<version>2.67.1</version><!-- {x-version-update:gax:current} -->
122+
</dependency>
123+
<dependency>
124+
<groupId>com.google.api</groupId>
125+
<artifactId>gax-httpjson</artifactId>
126+
<version>2.67.1</version><!-- {x-version-update:gax:current} -->
127+
<type>test-jar</type>
128+
<classifier>testlib</classifier>
129+
</dependency>
130+
<dependency>
131+
<groupId>com.google.api</groupId>
132+
<artifactId>gax-httpjson</artifactId>
133+
<version>2.67.1</version><!-- {x-version-update:gax:current} -->
134+
<classifier>testlib</classifier>
135+
</dependency>
136+
<!-- End of the content of gax-bom -->
137+
87138
<dependency>
88139
<groupId>com.google.api</groupId>
89140
<artifactId>gapic-generator-java</artifactId>

0 commit comments

Comments
 (0)