Skip to content

Commit ee39b54

Browse files
blakeli0blakeli0
committed
chore: Move proto-gapic-showcase-v1beta1 to each module so it does not conflict with proto-gapic-showcase-v1beta1-3.25.8.
1 parent 2219dd7 commit ee39b54

File tree

5 files changed

+55
-22
lines changed

5 files changed

+55
-22
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ jobs:
306306
- name: Showcase integration tests - protobuf-3.25.8
307307
working-directory: java-showcase
308308
run: |
309-
mvn clean verify -P 'enable-integration-tests,protobuf-3.25.8' \
309+
mvn clean verify -P '!showcase,enable-integration-tests,protobuf-3.25.8' \
310310
--batch-mode \
311311
--no-transfer-progress
312312
showcase:

‎java-showcase/gapic-showcase/pom.xml‎

Lines changed: 50 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,6 @@
102102
<groupId>com.google.api.grpc</groupId>
103103
<artifactId>proto-google-common-protos</artifactId>
104104
</dependency>
105-
<dependency>
106-
<groupId>com.google.api.grpc</groupId>
107-
<artifactId>proto-gapic-showcase-v1beta1-3.25.8</artifactId>
108-
</dependency>
109105
<dependency>
110106
<groupId>com.google.api.grpc</groupId>
111107
<artifactId>grpc-google-common-protos</artifactId>
@@ -115,10 +111,6 @@
115111
<groupId>com.google.api.grpc</groupId>
116112
<artifactId>proto-google-iam-v1</artifactId>
117113
</dependency>
118-
<dependency>
119-
<groupId>com.google.api.grpc</groupId>
120-
<artifactId>proto-gapic-showcase-v1beta1</artifactId>
121-
</dependency>
122114
<dependency>
123115
<groupId>com.google.guava</groupId>
124116
<artifactId>guava</artifactId>
@@ -232,6 +224,18 @@
232224

233225
</dependencies>
234226
<profiles>
227+
<profile>
228+
<id>showcase</id>
229+
<activation>
230+
<activeByDefault>true</activeByDefault>
231+
</activation>
232+
<dependencies>
233+
<dependency>
234+
<groupId>com.google.api.grpc</groupId>
235+
<artifactId>proto-gapic-showcase-v1beta1</artifactId>
236+
</dependency>
237+
</dependencies>
238+
</profile>
235239
<profile>
236240
<id>slf4j2_logback</id>
237241
<!--slf4j2, logback dependencies, and only compile logging test for 2.x-->
@@ -241,6 +245,10 @@
241245
</property>
242246
</activation>
243247
<dependencies>
248+
<dependency>
249+
<groupId>com.google.api.grpc</groupId>
250+
<artifactId>proto-gapic-showcase-v1beta1</artifactId>
251+
</dependency>
244252
<dependency>
245253
<groupId>org.slf4j</groupId>
246254
<artifactId>slf4j-api</artifactId>
@@ -285,6 +293,10 @@
285293
</property>
286294
</activation>
287295
<dependencies>
296+
<dependency>
297+
<groupId>com.google.api.grpc</groupId>
298+
<artifactId>proto-gapic-showcase-v1beta1</artifactId>
299+
</dependency>
288300
<dependency>
289301
<groupId>org.slf4j</groupId>
290302
<artifactId>slf4j-api</artifactId>
@@ -330,6 +342,10 @@
330342
</property>
331343
</activation>
332344
<dependencies>
345+
<dependency>
346+
<groupId>com.google.api.grpc</groupId>
347+
<artifactId>proto-gapic-showcase-v1beta1</artifactId>
348+
</dependency>
333349
<dependency>
334350
<groupId>org.slf4j</groupId>
335351
<artifactId>slf4j-api</artifactId>
@@ -370,10 +386,34 @@
370386
<dependencies>
371387
<dependency>
372388
<groupId>com.google.api.grpc</groupId>
373-
<artifactId>proto-gapic-showcase-v1beta1</artifactId>
374-
<version>0.0.1-SNAPSHOT-3.25.8</version>
389+
<artifactId>proto-gapic-showcase-v1beta1-3.25.8</artifactId>
390+
<version>0.0.1-SNAPSHOT</version>
391+
</dependency>
392+
<dependency>
393+
<groupId>com.google.api.grpc</groupId>
394+
<artifactId>grpc-gapic-showcase-v1beta1</artifactId>
395+
<exclusions>
396+
<exclusion>
397+
<groupId>com.google.api.grpc</groupId>
398+
<artifactId>proto-gapic-showcase-v1beta1</artifactId>
399+
</exclusion>
400+
</exclusions>
375401
</dependency>
376402
</dependencies>
403+
<build>
404+
<plugins>
405+
<plugin>
406+
<groupId>org.apache.maven.plugins</groupId>
407+
<artifactId>maven-compiler-plugin</artifactId>
408+
<configuration>
409+
<!-- Do not compile by default (without logging deps) -->
410+
<testExcludes>
411+
<testExclude>**/com/google/showcase/v1beta1/it/logging/*.java</testExclude>
412+
</testExcludes>
413+
</configuration>
414+
</plugin>
415+
</plugins>
416+
</build>
377417
</profile>
378418
</profiles>
379419

‎java-showcase/pom.xml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>com.google.api.grpc</groupId>
4141
<artifactId>proto-gapic-showcase-v1beta1-3.25.8</artifactId>
42-
<version>0.10.2-SNAPSHOT</version><!-- {x-version-update:proto-gapic-showcase-v1beta1-3.25.8:current} -->
42+
<version>0.0.1-SNAPSHOT</version>
4343
</dependency>
4444
<dependency>
4545
<groupId>com.google.api.grpc</groupId>
@@ -261,11 +261,5 @@
261261
</plugins>
262262
</build>
263263
</profile>
264-
<profile>
265-
<id>protobuf-3.25.8</id>
266-
<modules>
267-
<module>proto-gapic-showcase-v1beta1-3.25.8</module>
268-
</modules>
269-
</profile>
270264
</profiles>
271265
</project>

‎java-showcase/proto-gapic-showcase-v1beta1-3.25.8/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.google.api.grpc</groupId>
6-
<artifactId>proto-gapic-showcase-v1beta1</artifactId>
7-
<version>0.0.1-SNAPSHOT-3.25.8</version>
6+
<artifactId>proto-gapic-showcase-v1beta1-3.25.8</artifactId>
7+
<version>0.0.1-SNAPSHOT</version>
88
<name>proto-gapic-showcase-v1beta1-3.25.8</name>
99
<description>PROTO library for proto-gapic-showcase-v1beta1</description>
1010
<parent>

‎versions.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,4 @@ grpc-gapic-showcase-v1beta1:0.10.1:0.10.2-SNAPSHOT
2323
proto-google-iam-v3:1.58.1:1.58.2-SNAPSHOT
2424
grpc-google-iam-v3:1.58.1:1.58.2-SNAPSHOT
2525
proto-google-iam-v3beta:1.58.1:1.58.2-SNAPSHOT
26-
grpc-google-iam-v3beta:1.58.1:1.58.2-SNAPSHOT
27-
proto-gapic-showcase-v1beta1-3.25.8:0.10.1:0.10.2-SNAPSHOT
26+
grpc-google-iam-v3beta:1.58.1:1.58.2-SNAPSHOT

0 commit comments

Comments
 (0)