diff options
| author | James E. King III <jking@apache.org> | 2019-01-08 14:48:21 -0500 |
|---|---|---|
| committer | James E. King III <jking@apache.org> | 2019-01-08 14:48:21 -0500 |
| commit | 803bc50b979d15033caa8670b4fb2266616bd9d8 (patch) | |
| tree | ad347e64d25185bea228986020999be020aa0729 | |
| parent | 9313fbe278d8d8c9ae2436f8adddb0283cb8b047 (diff) | |
| parent | 858809fad01dba7318c33dc30f6cc92a6e2ac7b1 (diff) | |
| download | thrift-803bc50b979d15033caa8670b4fb2266616bd9d8.tar.gz | |
Merge remote-tracking branch 'origin/0.10.0'
| -rw-r--r-- | build/docker/old/debian-jessie/Dockerfile | 1 | ||||
| -rw-r--r-- | contrib/thrift-maven-plugin/pom.xml | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/build/docker/old/debian-jessie/Dockerfile b/build/docker/old/debian-jessie/Dockerfile index 7bc74fc24..941b4bb42 100644 --- a/build/docker/old/debian-jessie/Dockerfile +++ b/build/docker/old/debian-jessie/Dockerfile @@ -79,6 +79,7 @@ RUN apt-get install -y --no-install-recommends \ RUN apt-get install -y --no-install-recommends \ `# Ruby dependencies` \ ruby \ + ruby-bundler \ ruby-dev \ `# Perl dependencies` \ libbit-vector-perl \ diff --git a/contrib/thrift-maven-plugin/pom.xml b/contrib/thrift-maven-plugin/pom.xml index 1d66bc619..b65f6aa86 100644 --- a/contrib/thrift-maven-plugin/pom.xml +++ b/contrib/thrift-maven-plugin/pom.xml @@ -7,9 +7,9 @@ to you 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 - + http://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 @@ -17,8 +17,8 @@ specific language governing permissions and limitations under the License. --> -<project - xmlns="http://maven.apache.org/POM/4.0.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"> |