Skip to content
This repository was archived by the owner on May 8, 2026. It is now read-only.

Commit 3b67789

Browse files
committed
misc: Move around proto files to follow java convention and change packaging config
Change-Id: I1d7befa83ce79e92ec50458e137c243372574a40
1 parent 2ffad8d commit 3b67789

7 files changed

Lines changed: 1188 additions & 3 deletions

File tree

samples/install-without-bom/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@
4949

5050
<!-- compile and run all snippet tests -->
5151
<build>
52+
<resources>
53+
<resource>
54+
<directory>../snippets/src/main/resources</directory>
55+
</resource>
56+
</resources>
5257
<plugins>
5358
<plugin>
5459
<groupId>org.codehaus.mojo</groupId>

samples/snapshot/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@
4848

4949
<!-- compile and run all snippet tests -->
5050
<build>
51+
<resources>
52+
<resource>
53+
<directory>../snippets/src/main/resources</directory>
54+
</resource>
55+
</resources>
5156
<plugins>
5257
<plugin>
5358
<groupId>org.codehaus.mojo</groupId>

samples/snippets/pom.xml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version='1.0' encoding='UTF-8'?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
35
<modelVersion>4.0.0</modelVersion>
46
<groupId>com.google.cloud</groupId>
57
<artifactId>google-cloud-bigtable-snippets</artifactId>
@@ -56,4 +58,18 @@
5658
<scope>test</scope>
5759
</dependency>
5860
</dependencies>
61+
62+
<build>
63+
<plugins>
64+
<plugin>
65+
<groupId>org.apache.maven.plugins</groupId>
66+
<artifactId>maven-checkstyle-plugin</artifactId>
67+
<version>3.3.1</version>
68+
<configuration>
69+
<!-- exclude protoc generated file from checkstyle validation -->
70+
<excludes>**/SingerProto.java</excludes>
71+
</configuration>
72+
</plugin>
73+
</plugins>
74+
</build>
5975
</project>

samples/snippets/src/main/resources/README.md renamed to samples/snippets/src/main/resources/com/example/bigtable/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#### To generate SingerProto.java and descriptors.pb file from singer.proto using `protoc`
22
```shell
33
cd samples/snippets/src/main/resources/
4-
protoc --proto_path=com/example/bigtable/ --include_imports --descriptor_set_out=com/example/bigtable/descriptors.pb
5-
--java_out=. com/example/bigtable/singer.proto
4+
protoc --proto_path=com/example/bigtable/ --include_imports --descriptor_set_out=com/example/bigtable/descriptors.pb \
5+
--java_out=. com/example/bigtable/singer.proto
66
```

0 commit comments

Comments
 (0)