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

feat: add parent pom #3

Merged
merged 7 commits into from Sep 16, 2019
Merged

feat: add parent pom #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0c7db54
feat: add parent pom
chingor13 Sep 16, 2019
355f623
fix: missing header files on proto files
chingor13 Sep 16, 2019
a63c906
fix: parent pom can install
chingor13 Sep 16, 2019
46aef50
fix: dependency declarations
chingor13 Sep 16, 2019
0728bf0
chore: fix lint
chingor13 Sep 16, 2019
76a1e3f
deps: fix annotations-api declaration for Java 9+
chingor13 Sep 16, 2019
4d024fb
deps: grpc artifacts need annotation api
chingor13 Sep 16, 2019
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
104 changes: 57 additions & 47 deletions google-cloud-speech/pom.xml
View file
Open in desktop
@@ -1,6 +1,7 @@
<?xml version="1.0"?>
<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-cloud-speech</artifactId>
<version>1.20.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-speech:current} -->
<packaging>jar</packaging>
Expand All @@ -11,17 +12,13 @@
</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-clients</artifactId>
<version>0.108.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-clients:current} -->
<artifactId>google-cloud-speech-parent</artifactId>
<version>1.20.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-speech:current} -->
</parent>
<properties>
<site.installationModule>google-cloud-speech</site.installationModule>
</properties>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-core-grpc</artifactId>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-speech-v1p1beta1</artifactId>
Expand All @@ -30,6 +27,46 @@
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-speech-v1</artifactId>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>api-common</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-api</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax</artifactId>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax-grpc</artifactId>
</dependency>
<dependency>
<groupId>org.threeten</groupId>
<artifactId>threetenbp</artifactId>
</dependency>

<!-- Test dependencies -->
<dependency>
Expand Down Expand Up @@ -60,45 +97,18 @@
</dependency>
</dependencies>

<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<show>protected</show>
<nohelp>true</nohelp>
<doclint>none</doclint>
<splitindex>true</splitindex>
<offlineLinks>
<offlineLink>
<url>${project.javadoc.protobufBaseURL}</url>
<location>../../../../../google-api-grpc/proto-google-cloud-speech-v1/target/site/apidocs/</location>
</offlineLink>
<offlineLink>
<url>${project.javadoc.protobufBaseURL}</url>
<location>../../../../../google-api-grpc/grpc-google-cloud-speech-v1/target/site/apidocs/</location>
</offlineLink>
<offlineLink>
<url>${project.javadoc.protobufBaseURL}</url>
<location>../../../../../google-api-grpc/proto-google-cloud-speech-v1beta1/target/site/apidocs/</location>
</offlineLink>
<offlineLink>
<url>${project.javadoc.protobufBaseURL}</url>
<location>../../../../../google-api-grpc/grpc-google-cloud-speech-v1beta1/target/site/apidocs/</location>
</offlineLink>
<offlineLink>
<url>${project.javadoc.protobufBaseURL}</url>
<location>../../../../../google-api-grpc/proto-google-cloud-speech-v1p1beta1/target/site/apidocs/</location>
</offlineLink>
<offlineLink>
<url>${project.javadoc.protobufBaseURL}</url>
<location>../../../../../google-api-grpc/grpc-google-cloud-speech-v1p1beta1/target/site/apidocs/</location>
</offlineLink>
</offlineLinks>
</configuration>
</plugin>
</plugins>
</reporting>
<profiles>
<profile>
<id>java9</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
62 changes: 35 additions & 27 deletions grpc-google-cloud-speech-v1/pom.xml
View file
Open in desktop
Expand Up @@ -2,51 +2,59 @@
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.grpc</groupId>
<artifactId>grpc-google-cloud-speech-v1</artifactId>
<version>1.20.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-speech-v1:current} -->
<name>grpc-google-cloud-speech-v1</name>
<description>GRPC library for grpc-google-cloud-speech-v1</description>
<parent>
<groupId>com.google.api.grpc</groupId>
<artifactId>google-api-grpc</artifactId>
<version>0.73.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-speech-parent</artifactId>
<version>1.20.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-speech:current} -->
</parent>
<dependencies>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-api</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-speech-v1</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
</dependencies>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<show>protected</show>
<nohelp>true</nohelp>
<doclint>none</doclint>
<splitindex>true</splitindex>
<offlineLinks>
<offlineLink>
<url>${project.javadoc.protobufBaseURL}</url>
<location>../../../../proto-google-cloud-speech-v1/target/site/apidocs/</location>
</offlineLink>
</offlineLinks>
</configuration>
</plugin>
</plugins>
</reporting>

<profiles>
<profile>
<id>java9</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
15 changes: 15 additions & 0 deletions grpc-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechGrpc.java
View file
Open in desktop
@@ -1,3 +1,18 @@
/*
* Copyright 2019 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.google.cloud.speech.v1;

import static io.grpc.MethodDescriptor.generateFullMethodName;
Expand Down
62 changes: 35 additions & 27 deletions grpc-google-cloud-speech-v1beta1/pom.xml
View file
Open in desktop
Expand Up @@ -2,51 +2,59 @@
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.grpc</groupId>
<artifactId>grpc-google-cloud-speech-v1beta1</artifactId>
<version>0.73.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-speech-v1beta1:current} -->
<name>grpc-google-cloud-speech-v1beta1</name>
<description>GRPC library for grpc-google-cloud-speech-v1beta1</description>
<parent>
<groupId>com.google.api.grpc</groupId>
<artifactId>google-api-grpc</artifactId>
<version>0.73.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-speech-parent</artifactId>
<version>1.20.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-speech:current} -->
</parent>
<dependencies>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-api</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-speech-v1beta1</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
</dependencies>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<show>protected</show>
<nohelp>true</nohelp>
<doclint>none</doclint>
<splitindex>true</splitindex>
<offlineLinks>
<offlineLink>
<url>${project.javadoc.protobufBaseURL}</url>
<location>../../../../proto-google-cloud-speech-v1beta1/target/site/apidocs/</location>
</offlineLink>
</offlineLinks>
</configuration>
</plugin>
</plugins>
</reporting>

<profiles>
<profile>
<id>java9</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
15 changes: 15 additions & 0 deletions ...google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/SpeechGrpc.java
View file
Open in desktop
@@ -1,3 +1,18 @@
/*
* Copyright 2019 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.google.cloud.speech.v1beta1;

import static io.grpc.MethodDescriptor.generateFullMethodName;
Expand Down