From: Thanh Ha (zxiiro) <zxiiro@gmail.com>
Date: Thu, 12 Sep 2019 00:05:02 +0000 (+0000)
Subject: Merge "Revert "Upgrade rapidjson dep for opflex from 1.0.2 to 1.1.0""
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=4956d5cb2cf807fc9bc56c1cc70b69a313fe31de;hp=b2c1b78667b9752b56f55cc4004458d15664bb50;p=releng%2Fbuilder.git

Merge "Revert "Upgrade rapidjson dep for opflex from 1.0.2 to 1.1.0""
---

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index de582acadc..03875ddff8 100644
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -9,7 +9,7 @@
       - magnesium:
           branch: 'master'
           libuv-version: '1.8.0'
-          rapidjson-version: '1.1.0'
+          rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
       - sodium:
           branch: 'stable/sodium'
diff --git a/jjb/opflex/opflex-thirdparty-dependencies.yaml b/jjb/opflex/opflex-thirdparty-dependencies.yaml
index f87da7d01e..40e5e03bff 100644
--- a/jjb/opflex/opflex-thirdparty-dependencies.yaml
+++ b/jjb/opflex/opflex-thirdparty-dependencies.yaml
@@ -10,7 +10,7 @@
       - oxygen:
           branch: 'master'
           libuv-version: '1.8.0'
-          rapidjson-version: '1.1.0'
+          rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
           disable-job: true
 
diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml
index 6e11d16f11..f626297c3f 100644
--- a/jjb/opflex/opflex.yaml
+++ b/jjb/opflex/opflex.yaml
@@ -13,7 +13,7 @@
       - magnesium:
           branch: 'master'
           libuv-version: '1.8.0'
-          rapidjson-version: '1.1.0'
+          rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
       - sodium:
           branch: 'stable/sodium'
diff --git a/jjb/opflex/scripts/rapidjson-build.sh b/jjb/opflex/scripts/rapidjson-build.sh
index 1dc1446354..f40f199e69 100644
--- a/jjb/opflex/scripts/rapidjson-build.sh
+++ b/jjb/opflex/scripts/rapidjson-build.sh
@@ -24,7 +24,7 @@ mkdir -p "$DESTDIR/$ROOT/include"
 cp -R include/rapidjson "$DESTDIR/$ROOT/include"
 sed -e "s|@INCLUDE_INSTALL_DIR@|$ROOT/include|" \
     -e "s|@PROJECT_NAME@|RapidJSON|" \
-    -e "s|@LIB_VERSION_STRING@|1.1.0|" RapidJSON.pc.in > \
+    -e "s|@LIB_VERSION_STRING@|1.0.2|" RapidJSON.pc.in > \
     "$DESTDIR/$ROOT/lib/pkgconfig/RapidJSON.pc"
 
 pushd $DESTDIR