You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by an...@apache.org on 2017/05/26 17:11:13 UTC
[7/9] mesos git commit: Updated Mesos build library to use protobuf
3.3.0.
Updated Mesos build library to use protobuf 3.3.0.
Review: https://reviews.apache.org/r/58359/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/34519334
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/34519334
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/34519334
Branch: refs/heads/master
Commit: 34519334dd88b802cb6a7c6a664fa9280f93d828
Parents: 8eacd7c
Author: Zhitao Li <zh...@gmail.com>
Authored: Fri May 26 10:00:04 2017 -0700
Committer: Anand Mazumdar <an...@apache.org>
Committed: Fri May 26 10:00:04 2017 -0700
----------------------------------------------------------------------
configure.ac | 2 +-
src/java/mesos.pom.in | 2 +-
src/python/interface/setup.py.in | 2 +-
src/python/native_common/ext_modules.py.in | 2 +-
src/python/protocol/setup.py.in | 2 +-
support/mesos-tidy/entrypoint.sh | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/34519334/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index aa6d1eb..cf6080e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1458,7 +1458,7 @@ correct if youre already doing this.
fi
else
with_bundled_protobuf=yes
- PROTOBUF_JAR="\${MESOS_BUILD_DIR}/src/java/target/protobuf-java-2.6.1.jar"
+ PROTOBUF_JAR="\${MESOS_BUILD_DIR}/src/java/target/protobuf-java-3.3.0.jar"
fi
http://git-wip-us.apache.org/repos/asf/mesos/blob/34519334/src/java/mesos.pom.in
----------------------------------------------------------------------
diff --git a/src/java/mesos.pom.in b/src/java/mesos.pom.in
index 080767f..5642883 100644
--- a/src/java/mesos.pom.in
+++ b/src/java/mesos.pom.in
@@ -83,7 +83,7 @@
<dependency>
<artifactId>protobuf-java</artifactId>
<groupId>com.google.protobuf</groupId>
- <version>2.6.1</version>
+ <version>3.3.0</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/mesos/blob/34519334/src/python/interface/setup.py.in
----------------------------------------------------------------------
diff --git a/src/python/interface/setup.py.in b/src/python/interface/setup.py.in
index 8e38f3f..abf160c 100644
--- a/src/python/interface/setup.py.in
+++ b/src/python/interface/setup.py.in
@@ -26,7 +26,7 @@ config = {
'namespace_packages': [ 'mesos' ],
'packages': [ 'mesos', 'mesos.interface' ],
'package_dir': { '': 'src' },
- 'install_requires': [ 'google-common>=0.0.1', 'protobuf>=2.6.1,<4' ],
+ 'install_requires': [ 'google-common>=0.0.1', 'protobuf>=3.3.0,<4' ],
'license': 'Apache 2.0',
'keywords': 'mesos',
'classifiers': [ ]
http://git-wip-us.apache.org/repos/asf/mesos/blob/34519334/src/python/native_common/ext_modules.py.in
----------------------------------------------------------------------
diff --git a/src/python/native_common/ext_modules.py.in b/src/python/native_common/ext_modules.py.in
index e0bb335..39e0faa 100644
--- a/src/python/native_common/ext_modules.py.in
+++ b/src/python/native_common/ext_modules.py.in
@@ -43,7 +43,7 @@ def _create_module(module_name):
# libev.a and libprofiler.a).
glog = os.path.join('3rdparty', 'glog-0.3.3')
gperftools = os.path.join('3rdparty', 'gperftools-2.5')
- protobuf = os.path.join('3rdparty', 'protobuf-2.6.1')
+ protobuf = os.path.join('3rdparty', 'protobuf-3.3.0')
# Build the list of source files. Note that each source must be
# relative to our current directory (where this script lives).
http://git-wip-us.apache.org/repos/asf/mesos/blob/34519334/src/python/protocol/setup.py.in
----------------------------------------------------------------------
diff --git a/src/python/protocol/setup.py.in b/src/python/protocol/setup.py.in
index b7de10a..0fa0c17 100644
--- a/src/python/protocol/setup.py.in
+++ b/src/python/protocol/setup.py.in
@@ -26,7 +26,7 @@ config = {
'namespace_packages': [ 'mesos' ],
'packages': [ 'mesos', 'mesos.protocol' ],
'package_dir': { '': 'src' },
- 'install_requires': [ 'protobuf>=2.6.1,<4' ],
+ 'install_requires': [ 'protobuf>=3.3.0,<4' ],
'license': 'Apache 2.0',
'keywords': 'mesos',
'classifiers': [ ]
http://git-wip-us.apache.org/repos/asf/mesos/blob/34519334/support/mesos-tidy/entrypoint.sh
----------------------------------------------------------------------
diff --git a/support/mesos-tidy/entrypoint.sh b/support/mesos-tidy/entrypoint.sh
index 5a7d85d..6ef7835 100755
--- a/support/mesos-tidy/entrypoint.sh
+++ b/support/mesos-tidy/entrypoint.sh
@@ -48,7 +48,7 @@ cmake --build 3rdparty --target libevent-2.1.5-beta -- -j $(nproc) || true
cmake --build 3rdparty --target leveldb-1.19 -- -j $(nproc)
cmake --build 3rdparty --target nvml-352.79 -- -j $(nproc)
cmake --build 3rdparty --target picojson-1.3.0 -- -j $(nproc)
-cmake --build 3rdparty --target protobuf-2.6.1 -- -j $(nproc)
+cmake --build 3rdparty --target protobuf-3.3.0 -- -j $(nproc)
cmake --build 3rdparty --target zookeeper-3.4.8 -- -j $(nproc)
# Generate the protobuf definitions.