SEBA-513 Tosca engine should not require fields with Default set
Change-Id: Ic24522bc2924aa6d8f26c356a66865d173399938
diff --git a/VERSION b/VERSION
index 0d3ad67..0b6e431 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.10
+2.2.11
diff --git a/containers/chameleon/Dockerfile.chameleon b/containers/chameleon/Dockerfile.chameleon
index 79debb6..786793e 100644
--- a/containers/chameleon/Dockerfile.chameleon
+++ b/containers/chameleon/Dockerfile.chameleon
@@ -13,7 +13,7 @@
# limitations under the License.
# xosproject/chameleon
-FROM xosproject/xos-base:2.2.10
+FROM xosproject/xos-base:2.2.11
# xos-base already has protoc and dependencies installed
diff --git a/containers/xos/Dockerfile.client b/containers/xos/Dockerfile.client
index 0501e60..01994a3 100644
--- a/containers/xos/Dockerfile.client
+++ b/containers/xos/Dockerfile.client
@@ -13,7 +13,7 @@
# limitations under the License.
# xosproject/xos-client
-FROM xosproject/xos-libraries:2.2.10
+FROM xosproject/xos-libraries:2.2.11
# Install XOS client
COPY lib/xos-api /tmp/xos-api
diff --git a/containers/xos/Dockerfile.libraries b/containers/xos/Dockerfile.libraries
index 8d9652c..395c3c3 100644
--- a/containers/xos/Dockerfile.libraries
+++ b/containers/xos/Dockerfile.libraries
@@ -13,7 +13,7 @@
# limitations under the License.
# xosproject/xos-libraries
-FROM xosproject/xos-base:2.2.10
+FROM xosproject/xos-base:2.2.11
# Add libraries
COPY lib /opt/xos/lib
diff --git a/containers/xos/Dockerfile.synchronizer-base b/containers/xos/Dockerfile.synchronizer-base
index 619fef8..7211d60 100644
--- a/containers/xos/Dockerfile.synchronizer-base
+++ b/containers/xos/Dockerfile.synchronizer-base
@@ -13,7 +13,7 @@
# limitations under the License.
# xosproject/xos-synchronizer-base
-FROM xosproject/xos-client:2.2.10
+FROM xosproject/xos-client:2.2.11
COPY xos/synchronizers/new_base /opt/xos/synchronizers/new_base
COPY xos/xos/logger.py /opt/xos/xos/logger.py
diff --git a/containers/xos/Dockerfile.xos-core b/containers/xos/Dockerfile.xos-core
index 15a7222..825df32 100644
--- a/containers/xos/Dockerfile.xos-core
+++ b/containers/xos/Dockerfile.xos-core
@@ -13,7 +13,7 @@
# limitations under the License.
# xosproject/xos-core
-FROM xosproject/xos-libraries:2.2.10
+FROM xosproject/xos-libraries:2.2.11
# Install XOS
ADD xos /opt/xos
diff --git a/lib/xos-genx/xosgenx/jinja2_extensions/tosca.py b/lib/xos-genx/xosgenx/jinja2_extensions/tosca.py
index 4424824..b6ae85d 100644
--- a/lib/xos-genx/xosgenx/jinja2_extensions/tosca.py
+++ b/lib/xos-genx/xosgenx/jinja2_extensions/tosca.py
@@ -16,10 +16,10 @@
from xosgenx.jinja2_extensions import xproto_field_graph_components
-def xproto_tosca_required(null, blank, default=None):
-
- if null == "True" or blank == "True" or default != "False":
- return "false"
+def xproto_tosca_required(null, blank, default=None, modifier=None):
+ # `null` is not currently considered. `blank` is deprecated.
+ if (modifier == "optional") or (blank == "True") or (default is not None):
+ return "false"
return "true"