Skip to content
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.

Sign up for GitHub

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

Remove custom proto #501

Merged
merged 2 commits into from
Feb 7, 2017
Merged

Remove custom proto #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8605d9
Removes custom proto / libraries
gguuss Feb 6, 2017
7647150
Update to latest speech API
gguuss Feb 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 5 additions & 102 deletions speech/grpc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,21 +55,6 @@ limitations under the License.
</properties>

<profiles>
<profile>
<id>staged</id>
<repositories>
<repository>
<id>snapshots-repo</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
</profile>
<profile>
<id>jdk7</id>
<activation>
Expand All @@ -88,34 +73,15 @@ limitations under the License.
<jdk.version>1.8</jdk.version>
</properties>
</profile>
<profile>
<id>fedora</id>
<activation>
<property>
<name>os.detected.classifier</name>
<value>os.detected.release.fedora</value>
</property>
</activation>
<properties>
<tcnative.classifier>${os.detected.classifier}-fedora</tcnative.classifier>
</properties>
</profile>
<profile>
<id>non-fedora</id>
<activation>
<property>
<name>os.detected.classifier</name>
<value>!os.detected.release.fedora</value>
</property>
</activation>
<properties>
<tcnative.classifier>${os.detected.classifier}</tcnative.classifier>
</properties>
</profile>
</profiles>

<!-- // [START dependency] -->
<dependencies>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-speech</artifactId>
<version>0.8.3-alpha</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down Expand Up @@ -182,20 +148,6 @@ limitations under the License.
<artifactId>grpc-stub</artifactId>
<version>1.0.3</version>
</dependency>
<dependency>
<!--
- It is recommended to use OpenSSL: Statically Linked Netty
- for transport security. These steps do not use the TLS that
- comes with JDK (Jetty APLN/NPN), which is not
- recommended. See
- https://github.com/grpc/grpc-java/blob/master/SECURITY.md
- for details.
- -->
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
<version>1.1.33.Fork25</version>
<classifier>${tcnative.classifier}</classifier>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
Expand All @@ -216,60 +168,11 @@ limitations under the License.
<name>Central Repository</name>
<url>https://repo.maven.apache.org/maven2</url>
</pluginRepository>
<pluginRepository>
<id>protoc-plugin</id>
<url>https://dl.bintray.com/sergei-ivanov/maven/</url>
</pluginRepository>
</pluginRepositories>
<!-- // [START os-maven-plugin] -->
<build>
<extensions>
<extension>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
<version>1.4.1.Final</version>
</extension>
</extensions>
<!-- // [END os-maven-plugin] -->
<plugins>
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>${xolstice-protobuf-maven-plugin-version}</version>
<configuration>
<!--
The version of protoc must match protobuf-java. If you
don't depend on protobuf-java directly, you will be
transitively depending on the protobuf-java version that
grpc depends on.
-->
<protocArtifact>com.google.protobuf:protoc:3.0.0:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
<protoSourceRoot>${basedir}/src/main/java/third_party</protoSourceRoot>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc-protobuf-version}:exe:${os.detected.classifier}</pluginArtifact>
</configuration>
<executions>
<execution>
<goals>
<goal>compile</goal>
<goal>compile-custom</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>${codehaus-versions-maven-plugin-version}</version>
<executions>
<execution>
<phase>compile</phase>
<goals>
<goal>display-dependency-updates</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin-version}</version>
Expand Down
4 changes: 0 additions & 4 deletions speech/grpc/src/main/java/third_party/.gitignore
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions speech/grpc/src/main/java/third_party/google/api/annotations.proto
View file
Open in desktop

This file was deleted.

Loading