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

This reverts commit 439d272ac15d25556f386208e9c4d1cbb369f263.

Reason for revert: Issues with the jenkins jobs responsible for uploading artifacts to nexus are preventing this upgrade from completing and is currently breaking builds in the opflex project. The change will be reapplied when the jenkins job issues are resolved

Change-Id: I1acb51c2dc367e57729126f901942861e2fc5031
Signed-off-by: Tom Flynn <tom.flynn@gmail.com>

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index de582acadc8b3ee4a7701b8cb03073ea477751a1..03875ddff89d83ecda7f26df9556e1f69a351cd5 100644 (file)
--- 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 f87da7d01ea6209a43de5be5f2dad9b9c3f37488..40e5e03bffc08fc261cd189d6de6b66aeb6fac8c 100644 (file)
--- 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 6e11d16f11ae8e9e8e6be3cc4df079d82af6236d..f626297c3f1d0c9617c6bc448bb38da387507495 100644 (file)
--- 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 c44532799f1a10e63714a860f67dd52d5b3cb9e8..f46597a75918067a1dd9ab4f799204f29d4f44ca 100644 (file)
--- 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