Skip to content
This repository has been archived by the owner on Sep 18, 2023. It is now read-only.

feat: add DateTime/TimeOfDay protos #1

Merged
merged 5 commits into from May 4, 2020
Merged

feat: add DateTime/TimeOfDay protos #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
49f85d5
feat: add DateTime/TimeOfDay protos
chingor13 Apr 30, 2020
3374ce3
chore: Java 9+ requires javax.annotation-api
chingor13 Apr 30, 2020
7e7eb67
chore: specify annotations-api version, fix groupId
chingor13 Apr 30, 2020
2e05b22
chore: fix xml syntax
chingor13 Apr 30, 2020
8e3c234
specify annotations-api version
chingor13 May 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Expand Up @@ -14,4 +14,4 @@ target/
*.pyc
__pycache__

.flattenend-pom.xml
.flattened-pom.xml
20 changes: 18 additions & 2 deletions grpc-google-common-protos/pom.xml
View file
Open in desktop
Expand Up @@ -8,8 +8,8 @@
<name>grpc-google-common-protos</name>
<description>GRPC library for grpc-google-common-protos</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-iam-parent</artifactId>
<groupId>com.google.api.grpc</groupId>
<artifactId>google-common-protos-parent</artifactId>
<version>1.17.1-SNAPSHOT</version><!-- {x-version-update:proto-google-common-protos:current} -->
</parent>
<dependencies>
Expand Down Expand Up @@ -47,4 +47,20 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>java9</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
chingor13 marked this conversation as resolved.
Show resolved Hide resolved
<version>1.3.2</version>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
764 changes: 437 additions & 327 deletions grpc-google-common-protos/src/main/java/com/google/longrunning/OperationsGrpc.java
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions pom.xml
View file
Open in desktop
@@ -1,8 +1,8 @@
<?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.cloud</groupId>
<artifactId>google-iam-parent</artifactId>
<groupId>com.google.api.grpc</groupId>
<artifactId>google-common-protos-parent</artifactId>
<packaging>pom</packaging>
<version>1.17.1-SNAPSHOT</version><!-- {x-version-update:proto-google-common-protos:current} -->
<name>Google Common Protos Parent</name>
Expand Down Expand Up @@ -96,6 +96,11 @@
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>

<dependency>
<groupId>junit</groupId>
Expand Down
4 changes: 2 additions & 2 deletions proto-google-common-protos/pom.xml
View file
Open in desktop
Expand Up @@ -8,8 +8,8 @@
<name>proto-google-common-protos</name>
<description>PROTO library for proto-google-common-protos</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-iam-parent</artifactId>
<groupId>com.google.api.grpc</groupId>
<artifactId>google-common-protos-parent</artifactId>
<version>1.17.1-SNAPSHOT</version><!-- {x-version-update:proto-google-common-protos:current} -->
</parent>
<dependencies>
Expand Down