diff --git a/org.eclipse.winery.model.csar.toscametafile/src/main/java/org/eclipse/winery/model/csar/toscametafile/TOSCAMetaFileAttributes.java b/org.eclipse.winery.model.csar.toscametafile/src/main/java/org/eclipse/winery/model/csar/toscametafile/TOSCAMetaFileAttributes.java index 4c32d919b6..51475f15cd 100644 --- a/org.eclipse.winery.model.csar.toscametafile/src/main/java/org/eclipse/winery/model/csar/toscametafile/TOSCAMetaFileAttributes.java +++ b/org.eclipse.winery.model.csar.toscametafile/src/main/java/org/eclipse/winery/model/csar/toscametafile/TOSCAMetaFileAttributes.java @@ -21,7 +21,8 @@ public class TOSCAMetaFileAttributes { // of block 0 final public static String TOSCA_META_VERSION = "TOSCA-Meta-Version"; final public static String TOSCA_META_VERSION_VALUE = "1.0"; - final public static String TOSCA_META_VERSION_VALUE_FOR_YAML = "1.1"; + final public static String TOSCA_META_FILE_VERSION = "TOSCA-Meta-File-Version"; + final public static String TOSCA_META_FILE_VERSION_VALUE = "1.1"; final public static String CSAR_VERSION = "CSAR-Version"; final public static String CSAR_VERSION_VALUE = "1.0"; final public static String CSAR_VERSION_VALUE_FOR_YAML = "1.1"; diff --git a/org.eclipse.winery.model.csar.toscametafile/src/main/java/org/eclipse/winery/model/csar/toscametafile/YamlTOSCAMetaFileParser.java b/org.eclipse.winery.model.csar.toscametafile/src/main/java/org/eclipse/winery/model/csar/toscametafile/YamlTOSCAMetaFileParser.java index f6282861a6..e5022d7cfc 100644 --- a/org.eclipse.winery.model.csar.toscametafile/src/main/java/org/eclipse/winery/model/csar/toscametafile/YamlTOSCAMetaFileParser.java +++ b/org.eclipse.winery.model.csar.toscametafile/src/main/java/org/eclipse/winery/model/csar/toscametafile/YamlTOSCAMetaFileParser.java @@ -23,10 +23,10 @@ protected int validateMetaVersion(String metaFileVersion) { int errors = 0; if (metaFileVersion == null) { - this.logAttrMissing(TOSCAMetaFileAttributes.TOSCA_META_VERSION, 0); + this.logAttrMissing(TOSCAMetaFileAttributes.TOSCA_META_FILE_VERSION, 0); errors++; - } else if (!metaFileVersion.trim().equals(TOSCAMetaFileAttributes.TOSCA_META_VERSION_VALUE_FOR_YAML)) { - this.logAttrWrongVal(TOSCAMetaFileAttributes.TOSCA_META_VERSION, 0, TOSCAMetaFileAttributes.TOSCA_META_VERSION_VALUE_FOR_YAML); + } else if (!metaFileVersion.trim().equals(TOSCAMetaFileAttributes.TOSCA_META_FILE_VERSION_VALUE)) { + this.logAttrWrongVal(TOSCAMetaFileAttributes.TOSCA_META_FILE_VERSION, 0, TOSCAMetaFileAttributes.TOSCA_META_FILE_VERSION_VALUE); errors++; } return errors; diff --git a/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/yaml/export/YamlExporter.java b/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/yaml/export/YamlExporter.java index 801bcaf540..d608e283f1 100644 --- a/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/yaml/export/YamlExporter.java +++ b/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/yaml/export/YamlExporter.java @@ -53,8 +53,8 @@ import static org.eclipse.winery.model.csar.toscametafile.TOSCAMetaFileAttributes.CSAR_VERSION_VALUE_FOR_YAML; import static org.eclipse.winery.model.csar.toscametafile.TOSCAMetaFileAttributes.ENTRY_DEFINITIONS; import static org.eclipse.winery.model.csar.toscametafile.TOSCAMetaFileAttributes.NAME; -import static org.eclipse.winery.model.csar.toscametafile.TOSCAMetaFileAttributes.TOSCA_META_VERSION; -import static org.eclipse.winery.model.csar.toscametafile.TOSCAMetaFileAttributes.TOSCA_META_VERSION_VALUE_FOR_YAML; +import static org.eclipse.winery.model.csar.toscametafile.TOSCAMetaFileAttributes.TOSCA_META_FILE_VERSION; +import static org.eclipse.winery.model.csar.toscametafile.TOSCAMetaFileAttributes.TOSCA_META_FILE_VERSION_VALUE; public class YamlExporter extends CsarExporter { @@ -163,7 +163,7 @@ private String addManifest(IRepository repository, DefinitionsChildId id, Map