diff options
| author | Olli Virtanen <ovirtanen@gmail.com> | 2019-03-15 12:37:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-15 12:37:10 +0100 |
| commit | aef75eae6244583e7ad429049ad4efe1ec46e70b (patch) | |
| tree | c67a5fbe8be85373a7557617b407cdb186da3d6f /container-dependency-versions/pom.xml | |
| parent | 2e8f039246b4b69303f2da48f37819a6c24ce887 (diff) | |
| parent | cd43364b451b40936fd2e21cb868820438536d78 (diff) | |
Merge pull request #8739 from vespa-engine/ollivir/protobuf-search
Protobuf over jrt support in search
Diffstat (limited to 'container-dependency-versions/pom.xml')
| -rw-r--r-- | container-dependency-versions/pom.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 48cd9da9a01..af6dbb5216e 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -383,6 +383,11 @@ <artifactId>xml-apis</artifactId> <version>1.4.01</version> </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>${protobuf.version}</version> + </dependency> <!-- NOTE: The dependencies below are not provided from the jdisc container runtime, but had to be moved here from 'parent' because factorylib reads the text in parent/pom.xml and this pom file to @@ -454,6 +459,7 @@ <jaxb.version>2.3.0</jaxb.version> <jetty.version>9.4.15.v20190215</jetty.version> <slf4j.version>1.7.5</slf4j.version> + <protobuf.version>3.7.0</protobuf.version> <!-- These must be kept in sync with version used by current jersey2.version. --> <!-- MUST be updated each time jersey2 is upgraded! --> |