-
Notifications
You must be signed in to change notification settings - Fork 53
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.
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
feat: parent pom and gapic-generator-java-bom #1170
Merged
Merged
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
aea0f3a
feat: parent pom and gapic-generator-java-bom
suztomo c4ffd54
No tabs
suztomo c8d574a
Merge branch 'main' into gapic-generator-bom
suztomo c73a0d7
gax's dependencies with annotations
suztomo 37bc932
Merge branch 'main' into gapic-generator-bom
suztomo 89dc113
Merge branch 'main' into gapic-generator-bom
suztomo 00a38f5
Merge branch 'main' into gapic-generator-bom
suztomo c49ba09
using gapic-generator-java-bom
suztomo 8f90665
protobuf bom
suztomo e071006
gRPC and Protobuf as part of the BOM
suztomo 15ab349
Maven format plugin run at the root
suztomo 305253e
Consolidate external dependencies to the parent
suztomo 8f0b772
install before running test
suztomo 07c8fb1
snapshot versions
suztomo 39174bb
Build gax with Java 11
suztomo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <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"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <groupId>com.google.api</groupId> | ||
| <artifactId>gapic-generator-java-bom</artifactId> | ||
| <packaging>pom</packaging> | ||
| <version>2.12.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} --> | ||
| <name>GAPIC Generator Java BOM</name> | ||
| <description> | ||
| BOM for the libraries in gapic-generator-java repository. Users should not | ||
| depend on this artifact explicitly because this BOM is an implementation | ||
| detail of the Libraries BOM. | ||
| </description> | ||
|
|
||
| <parent> | ||
| <groupId>com.google.cloud</groupId> | ||
| <artifactId>gapic-generator-java-pom-parent</artifactId> | ||
| <version>2.12.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} --> | ||
| <relativePath>../gapic-generator-java-pom-parent</relativePath> | ||
| </parent> | ||
|
|
||
| <dependencyManagement> | ||
| <dependencies> | ||
| <!-- Major external dependencies --> | ||
| <dependency> | ||
| <groupId>io.grpc</groupId> | ||
| <artifactId>grpc-bom</artifactId> | ||
| <version>${grpc.version}</version> | ||
| <type>pom</type> | ||
| <scope>import</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.google.protobuf</groupId> | ||
| <artifactId>protobuf-bom</artifactId> | ||
| <version>${protobuf.version}</version> | ||
| <type>pom</type> | ||
| <scope>import</scope> | ||
| </dependency> | ||
|
|
||
| <!-- Libraries published from this repositories --> | ||
| <dependency> | ||
| <groupId>com.google.api</groupId> | ||
| <artifactId>api-common</artifactId> | ||
| <version>2.3.2-SNAPSHOT</version><!-- {x-version-update:api-common:current} --> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.google.api</groupId> | ||
| <artifactId>gax-bom</artifactId> | ||
| <version>2.20.2-SNAPSHOT</version><!-- {x-version-update:gax:current} --> | ||
| <type>pom</type> | ||
| <scope>import</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.google.api.grpc</groupId> | ||
| <artifactId>grpc-google-common-protos</artifactId> | ||
| <version>2.11.1-SNAPSHOT</version><!-- {x-version-update:proto-google-common-protos:current} --> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.google.api.grpc</groupId> | ||
| <artifactId>proto-google-common-protos</artifactId> | ||
| <version>2.11.1-SNAPSHOT</version><!-- {x-version-update:proto-google-common-protos:current} --> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.google.api.grpc</groupId> | ||
| <artifactId>proto-google-iam-v1</artifactId> | ||
| <version>1.6.23-SNAPSHOT</version><!-- {x-version-update:proto-google-iam-v1:current} --> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.google.api.grpc</groupId> | ||
| <artifactId>proto-google-iam-v2</artifactId> | ||
| <version>1.6.23-SNAPSHOT</version><!-- {x-version-update:proto-google-iam-v2:current} --> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.google.api.grpc</groupId> | ||
| <artifactId>proto-google-iam-v2beta</artifactId> | ||
| <version>1.6.23-SNAPSHOT</version><!-- {x-version-update:proto-google-iam-v2beta:current} --> | ||
| </dependency> | ||
|
|
||
| <!-- Following test deps are kept to keep them consistent with versions above --> | ||
| <dependency> | ||
| <groupId>com.google.api.grpc</groupId> | ||
| <artifactId>grpc-google-iam-v1</artifactId> | ||
| <version>1.6.23-SNAPSHOT</version><!-- {x-version-update:grpc-google-iam-v1:current} --> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.google.api.grpc</groupId> | ||
| <artifactId>grpc-google-iam-v2</artifactId> | ||
| <version>1.6.23-SNAPSHOT</version><!-- {x-version-update:grpc-google-iam-v2:current} --> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.google.api.grpc</groupId> | ||
| <artifactId>grpc-google-iam-v2beta</artifactId> | ||
| <version>1.6.23-SNAPSHOT</version><!-- {x-version-update:grpc-google-iam-v2beta:current} --> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| </dependencyManagement> | ||
|
|
||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <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" child.project.url.inherit.append.path="false"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <groupId>com.google.cloud</groupId> | ||
| <artifactId>gapic-generator-java-pom-parent</artifactId> | ||
| <version>2.12.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} --> | ||
| <packaging>pom</packaging> | ||
| <name>GAPIC Generator Java POM Parent</name> | ||
| <url>https://github.com/googleapis/google-cloud-java</url> | ||
| <description> | ||
| The top-level parent for all modules in the repository. | ||
| </description> | ||
| <parent> | ||
| <groupId>com.google.cloud</groupId> | ||
| <artifactId>google-cloud-shared-config</artifactId> | ||
| <version>1.5.5</version> | ||
| <relativePath/> | ||
| </parent> | ||
|
|
||
| <properties> | ||
| <skipUnitTests>false</skipUnitTests> | ||
| <checkstyle.header.file>java.header</checkstyle.header.file> | ||
|
|
||
| <!-- External dependencies, expecially gRPC and Protobuf version, should be | ||
| consistent across modules in this repository --> | ||
| <javax.annotation-api.version>1.3.2</javax.annotation-api.version> | ||
| <grpc.version>1.51.1</grpc.version> | ||
| <guava.version>31.1-jre</guava.version> | ||
| <protobuf.version>3.21.10</protobuf.version> | ||
| </properties> | ||
|
|
||
| <developers> | ||
| <developer> | ||
| <id>suztomo</id> | ||
| <name>Tomo Suzuki</name> | ||
| <email>suztomo@google.com</email> | ||
| <organization>Google</organization> | ||
| <roles> | ||
| <role>Developer</role> | ||
| </roles> | ||
| </developer> | ||
| </developers> | ||
| <organization> | ||
| <name>Google LLC</name> | ||
| </organization> | ||
| <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" | ||
| child.scm.url.inherit.append.path="false"> | ||
| <connection>scm:git:git@github.com:googleapis/google-cloud-java.git</connection> | ||
| <developerConnection>scm:git:git@github.com:googleapis/google-cloud-java.git</developerConnection> | ||
| <url>https://github.com/googleapis/google-cloud-java</url> | ||
| <tag>HEAD</tag> | ||
| </scm> | ||
| <issueManagement> | ||
| <url>https://github.com/googleapis/google-cloud-java/issues</url> | ||
| <system>GitHub Issues</system> | ||
| </issueManagement> | ||
|
|
||
| <licenses> | ||
| <license> | ||
| <name>Apache-2.0</name> | ||
| <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url> | ||
| </license> | ||
| </licenses> | ||
|
|
||
| <profiles> | ||
| <profile> | ||
| <!-- Only run checkstyle plugin on Java 11+ (checkstyle artifact only supports Java 11+) --> | ||
| <id>checkstyle-tests</id> | ||
| <activation> | ||
| <jdk>[11,)</jdk> | ||
| </activation> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-checkstyle-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>checkstyle</id> | ||
| <phase>validate</phase> | ||
| <goals> | ||
| <goal>check</goal> | ||
| </goals> | ||
| <configuration> | ||
| <headerLocation>${checkstyle.header.file}</headerLocation> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </profile> | ||
| </profiles> | ||
|
|
||
| <repositories> | ||
| <repository> | ||
| <id>google-maven-central-copy</id> | ||
| <name>Google Maven Central copy</name> | ||
| <url>https://maven-central.storage-download.googleapis.com/maven2</url> | ||
| </repository> | ||
| <repository> | ||
| <id>maven-central</id> | ||
| <name>Maven Central</name> | ||
| <url>https://repo1.maven.org/maven2</url> | ||
| </repository> | ||
| </repositories> | ||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With this PR, gapic-generator-java alone does not work. So running the fmt:check plugin from the root.