build: Update version to 1.2.1

Change-Id: Ib8994521a91c17d3714d0594d6fbc05e335cd82e
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14453
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15263
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

diff --git a/build_common/SConscript b/build_common/SConscript
index 5f3f64c..ca1eb7a 100644 (file)
--- a/build_common/SConscript
+++ b/build_common/SConscript
@@ -6,7 +6,7 @@
 import os
 import platform
 
-project_version = '1.2.0'
+project_version = '1.2.1'
 
 # Map of host os and allowed target os (host: allowed target os)
 host_target_map = {

diff --git a/java/iotivity-android/build.gradle b/java/iotivity-android/build.gradle
index 57a9d58..0907704 100755 (executable)
--- a/java/iotivity-android/build.gradle
+++ b/java/iotivity-android/build.gradle
@@ -73,7 +73,7 @@ android {
         minSdkVersion 21\r
         targetSdkVersion 21\r
         versionCode 1\r
-        versionName "1.2.0"\r
+        versionName "1.2.1"\r
         buildConfigField 'int', 'SECURED', SECURED\r
         buildConfigField 'int', 'WITH_TCP', WITH_TCP\r
         buildConfigField 'int', 'WITH_CLOUD', WITH_CLOUD\r

diff --git a/resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec b/resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec
index 0e0458f..75cfdaa 100644 (file)
--- a/resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec
+++ b/resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec
@@ -4,7 +4,7 @@
 %define DEST_LIB_DIR  %{buildroot}/%{_libdir}
 
 Name: com-oic-ca
-Version:    1.2.0
+Version:    1.2.1
 Release:    0
 Summary: Tizen oicca application
 Group: Network & Connectivity / IoT Connectivity

diff --git a/resource/csdk/logger/include/logger.h b/resource/csdk/logger/include/logger.h
index 35a4e04..3f7dbe7 100644 (file)
--- a/resource/csdk/logger/include/logger.h
+++ b/resource/csdk/logger/include/logger.h
@@ -21,7 +21,7 @@
 #ifndef LOGGER_H_
 #define LOGGER_H_
 
-#define IOTIVITY_VERSION "1.2.0"
+#define IOTIVITY_VERSION "1.2.1"
 
 #include <stdint.h>
 #include <stdio.h>

diff --git a/resource/csdk/stack/samples/tizen/SimpleClientServer/packaging/com.oic.ri.sample.spec b/resource/csdk/stack/samples/tizen/SimpleClientServer/packaging/com.oic.ri.sample.spec
index 256aa0f..ef8e485 100644 (file)
--- a/resource/csdk/stack/samples/tizen/SimpleClientServer/packaging/com.oic.ri.sample.spec
+++ b/resource/csdk/stack/samples/tizen/SimpleClientServer/packaging/com.oic.ri.sample.spec
@@ -2,7 +2,7 @@
 %define ROOTDIR  %{_builddir}/%{name}-%{version}
 
 Name: com-oic-ri-sample
-Version:    1.2.0
+Version:    1.2.1
 Release:    0
 Summary: Tizen adapter interfacesample application
 Group: Network & Connectivity / IoT Connectivity

diff --git a/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec b/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec
index b8196f9..628bb2f 100644 (file)
--- a/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec
+++ b/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec
@@ -4,7 +4,7 @@
 %define DEST_LIB_DIR  %{buildroot}/%{_libdir}
 
 Name: com-oic-ri
-Version:    1.2.0
+Version:    1.2.1
 Release:    0
 Summary: Tizen oicri application
 Group: Network & Connectivity / IoT Connectivity

diff --git a/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/packaging/com.oic.es.sample.spec b/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/packaging/com.oic.es.sample.spec
index bec2298..fbf1fb6 100644 (file)
--- a/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/packaging/com.oic.es.sample.spec
+++ b/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/packaging/com.oic.es.sample.spec
@@ -3,7 +3,7 @@
 %{!?VERBOSE: %define VERBOSE 1}
 
 Name: com-oic-es-sample
-Version:    1.2.0
+Version:    1.2.1
 Release:    0
 Summary: Tizen adapter interfacesample application
 Group: Network & Connectivity / IoT Connectivity

diff --git a/service/notification/src/common/NSConstants.h b/service/notification/src/common/NSConstants.h
index 8393531..baff965 100644 (file)
--- a/service/notification/src/common/NSConstants.h
+++ b/service/notification/src/common/NSConstants.h
@@ -203,7 +203,7 @@
         } \
     }
 
-#define VERSION        "1.2.0"
+#define VERSION        "1.2.1"
 
 #define NS_ATTRIBUTE_VERSION "x.org.iotivity.ns.version"
 #define NS_ATTRIBUTE_POLICY "x.org.iotivity.ns.subcontrollability"

diff --git a/tools/tizen/iotivity.spec b/tools/tizen/iotivity.spec
index 80dfd0d..16c6352 100644 (file)
--- a/tools/tizen/iotivity.spec
+++ b/tools/tizen/iotivity.spec
@@ -1,5 +1,5 @@
 Name: iotivity
-Version: 1.2.0
+Version: 1.2.1
 Release: 0
 Summary: IoT Connectivity sponsored by the OCF
 Group: Network & Connectivity / IoT Connectivity