Skip to content

Commit d8605d9

Browse files
committed
Removes custom proto / libraries
1 parent 4ea0be3 commit d8605d9

27 files changed

+5
-2795
lines changed

speech/grpc/pom.xml

+5-102
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,6 @@ limitations under the License.
5555
</properties>
5656

5757
<profiles>
58-
<profile>
59-
<id>staged</id>
60-
<repositories>
61-
<repository>
62-
<id>snapshots-repo</id>
63-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
64-
<releases>
65-
<enabled>false</enabled>
66-
</releases>
67-
<snapshots>
68-
<enabled>true</enabled>
69-
</snapshots>
70-
</repository>
71-
</repositories>
72-
</profile>
7358
<profile>
7459
<id>jdk7</id>
7560
<activation>
@@ -88,34 +73,15 @@ limitations under the License.
8873
<jdk.version>1.8</jdk.version>
8974
</properties>
9075
</profile>
91-
<profile>
92-
<id>fedora</id>
93-
<activation>
94-
<property>
95-
<name>os.detected.classifier</name>
96-
<value>os.detected.release.fedora</value>
97-
</property>
98-
</activation>
99-
<properties>
100-
<tcnative.classifier>${os.detected.classifier}-fedora</tcnative.classifier>
101-
</properties>
102-
</profile>
103-
<profile>
104-
<id>non-fedora</id>
105-
<activation>
106-
<property>
107-
<name>os.detected.classifier</name>
108-
<value>!os.detected.release.fedora</value>
109-
</property>
110-
</activation>
111-
<properties>
112-
<tcnative.classifier>${os.detected.classifier}</tcnative.classifier>
113-
</properties>
114-
</profile>
11576
</profiles>
11677

11778
<!-- // [START dependency] -->
11879
<dependencies>
80+
<dependency>
81+
<groupId>com.google.cloud</groupId>
82+
<artifactId>google-cloud-speech</artifactId>
83+
<version>0.8.1-alpha</version>
84+
</dependency>
11985
<dependency>
12086
<groupId>junit</groupId>
12187
<artifactId>junit</artifactId>
@@ -182,20 +148,6 @@ limitations under the License.
182148
<artifactId>grpc-stub</artifactId>
183149
<version>1.0.3</version>
184150
</dependency>
185-
<dependency>
186-
<!--
187-
- It is recommended to use OpenSSL: Statically Linked Netty
188-
- for transport security. These steps do not use the TLS that
189-
- comes with JDK (Jetty APLN/NPN), which is not
190-
- recommended. See
191-
- https://github.com/grpc/grpc-java/blob/master/SECURITY.md
192-
- for details.
193-
- -->
194-
<groupId>io.netty</groupId>
195-
<artifactId>netty-tcnative-boringssl-static</artifactId>
196-
<version>1.1.33.Fork25</version>
197-
<classifier>${tcnative.classifier}</classifier>
198-
</dependency>
199151
<dependency>
200152
<groupId>log4j</groupId>
201153
<artifactId>log4j</artifactId>
@@ -216,60 +168,11 @@ limitations under the License.
216168
<name>Central Repository</name>
217169
<url>https://repo.maven.apache.org/maven2</url>
218170
</pluginRepository>
219-
<pluginRepository>
220-
<id>protoc-plugin</id>
221-
<url>https://dl.bintray.com/sergei-ivanov/maven/</url>
222-
</pluginRepository>
223171
</pluginRepositories>
224172
<!-- // [START os-maven-plugin] -->
225173
<build>
226-
<extensions>
227-
<extension>
228-
<groupId>kr.motd.maven</groupId>
229-
<artifactId>os-maven-plugin</artifactId>
230-
<version>1.4.1.Final</version>
231-
</extension>
232-
</extensions>
233174
<!-- // [END os-maven-plugin] -->
234175
<plugins>
235-
<plugin>
236-
<groupId>org.xolstice.maven.plugins</groupId>
237-
<artifactId>protobuf-maven-plugin</artifactId>
238-
<version>${xolstice-protobuf-maven-plugin-version}</version>
239-
<configuration>
240-
<!--
241-
The version of protoc must match protobuf-java. If you
242-
don't depend on protobuf-java directly, you will be
243-
transitively depending on the protobuf-java version that
244-
grpc depends on.
245-
-->
246-
<protocArtifact>com.google.protobuf:protoc:3.0.0:exe:${os.detected.classifier}</protocArtifact>
247-
<pluginId>grpc-java</pluginId>
248-
<protoSourceRoot>${basedir}/src/main/java/third_party</protoSourceRoot>
249-
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc-protobuf-version}:exe:${os.detected.classifier}</pluginArtifact>
250-
</configuration>
251-
<executions>
252-
<execution>
253-
<goals>
254-
<goal>compile</goal>
255-
<goal>compile-custom</goal>
256-
</goals>
257-
</execution>
258-
</executions>
259-
</plugin>
260-
<plugin>
261-
<groupId>org.codehaus.mojo</groupId>
262-
<artifactId>versions-maven-plugin</artifactId>
263-
<version>${codehaus-versions-maven-plugin-version}</version>
264-
<executions>
265-
<execution>
266-
<phase>compile</phase>
267-
<goals>
268-
<goal>display-dependency-updates</goal>
269-
</goals>
270-
</execution>
271-
</executions>
272-
</plugin>
273176
<plugin>
274177
<artifactId>maven-compiler-plugin</artifactId>
275178
<version>${maven-compiler-plugin-version}</version>

speech/grpc/src/main/java/third_party/.gitignore

-4
This file was deleted.

speech/grpc/src/main/java/third_party/google/api/annotations.proto

-29
This file was deleted.

0 commit comments

Comments
 (0)