diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-03-15 18:14:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-15 18:14:17 +0100 |
| commit | 7f56c30703f5319f5368653f6313a8f12f07b3cb (patch) | |
| tree | 394c9717eee127c407e3d3222169bab4a420228e /parent | |
| parent | 156743b84071f04114bc4479a3bcc3ca10b2f7e5 (diff) | |
Revert "Protobuf over jrt support in search"
Diffstat (limited to 'parent')
| -rw-r--r-- | parent/pom.xml | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/parent/pom.xml b/parent/pom.xml index 62d97263aaf..2e0bbf1b3ad 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -263,27 +263,6 @@ </executions> </plugin> <plugin> - <groupId>com.github.os72</groupId> - <artifactId>protoc-jar-maven-plugin</artifactId> - <version>3.6.0.2</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <addSources>main</addSources> - <outputDirectory>${project.build.directory}/generated-sources/protobuf</outputDirectory> - <inputDirectories> - <include>src/main/protobuf</include> - <include>src/protobuf</include> - </inputDirectories> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>com.yahoo.vespa</groupId> <artifactId>abi-check-plugin</artifactId> <version>${project.version}</version> @@ -433,6 +412,11 @@ <version>${asm.version}</version> </dependency> <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>3.4.0</version> + </dependency> + <dependency> <groupId>com.goldmansachs</groupId> <artifactId>gs-collections</artifactId> <version>6.1.0</version> |