changes

src/main/java/org/cyclonedx/generators/AbstractBomGenerator.java

@@ -8,6 +8,7 @@
 import org.cyclonedx.model.Component;
 import org.cyclonedx.model.component.Component12Mixin;
 import org.cyclonedx.model.component.Component16Mixin;
+import org.cyclonedx.util.serializer.CustomEnumSerializerModifier;
 import org.cyclonedx.util.serializer.CustomSerializerModifier;
 import org.cyclonedx.util.serializer.EnvironmentVarsSerializer;
 import org.cyclonedx.util.serializer.EvidenceSerializer;
@@ -43,6 +44,9 @@ public Version getSchemaVersion() {
   }
 
   protected void setupObjectMapper(boolean isXml) {
+    mapper.addMixIn(Component.class, Component12Mixin.class);
+    mapper.addMixIn(Component.class, Component16Mixin.class);
+
     SimpleModule licenseModule = new SimpleModule();
     licenseModule.addSerializer(new LicenseChoiceSerializer(isXml, version));
     mapper.registerModule(licenseModule);
@@ -102,5 +106,8 @@ protected void setupObjectMapper(boolean isXml) {
     mapper.addMixIn(Component.class, Component12Mixin.class);
     mapper.addMixIn(Component.class, Component16Mixin.class);
 
+    SimpleModule module = new SimpleModule();
+    module.setSerializerModifier(new CustomEnumSerializerModifier(version));
+    //mapper.registerModule(module);
   }
 }

src/main/java/org/cyclonedx/model/Mandatory.java

@@ -0,0 +1,8 @@
+package org.cyclonedx.model;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Mandatory {
+}

src/main/java/org/cyclonedx/model/component/Component12Mixin.java

@@ -8,5 +8,5 @@ public abstract class Component12Mixin
 {
   @JsonProperty("author")
   @VersionFilter(Version.VERSION_12)
-  abstract String getOldAuthor();
+  abstract String getAuthor();
 }

src/main/java/org/cyclonedx/util/serializer/CustomEnumSerializerModifier.java

@@ -4,13 +4,15 @@
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializationConfig;
-import com.fasterxml.jackson.databind.ser.BeanPropertyWriter;
 import com.fasterxml.jackson.databind.ser.BeanSerializerModifier;
 import org.cyclonedx.Version;
 import org.cyclonedx.model.VersionFilter;
-;
-import java.util.ArrayList;
-import java.util.List;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.EnumSerializer;
+
+import java.io.IOException;
 
 public class CustomEnumSerializerModifier extends BeanSerializerModifier {
 
@@ -22,39 +24,29 @@ public CustomEnumSerializerModifier(Version currentVersion) {
 
   @Override
   public JsonSerializer<?> modifyEnumSerializer(SerializationConfig config, JavaType type, BeanDescription beanDesc, JsonSerializer<?> serializer) {
-    return new VersionFilteringEnumSerializer(currentVersion);
+    return new VersionFilteringEnumSerializer((EnumSerializer) serializer, currentVersion);
   }
 
-  @Override
-  public List<BeanPropertyWriter> changeProperties(SerializationConfig config, BeanDescription beanDesc, List<BeanPropertyWriter> beanProperties) {
-    List<BeanPropertyWriter> newProperties = new ArrayList<>();
-    for (BeanPropertyWriter writer : beanProperties) {
-      if (shouldInclude(writer)) {
-        newProperties.add(writer);
-      }
-    }
-    return newProperties;
-  }
+  public static class VersionFilteringEnumSerializer extends JsonSerializer<Enum<?>> {
+
+    private final EnumSerializer defaultSerializer;
+    private final Version currentVersion;
 
-  private boolean shouldInclude(BeanPropertyWriter writer) {
-    // Check for VersionFilter annotation and current version here
-    VersionFilter versionFilter = writer.getAnnotation(VersionFilter.class);
-    if (versionFilter != null && versionFilter.value().compareTo(currentVersion) > 0) {
-      return false;
+    public VersionFilteringEnumSerializer(EnumSerializer defaultSerializer, Version currentVersion) {
+      this.defaultSerializer = defaultSerializer;
+      this.currentVersion = currentVersion;
     }
 
-    // Check if the property is an Enum with VersionFilter annotation
-    if (Enum.class.isAssignableFrom(writer.getType().getRawClass())) {
+    @Override
+    public void serialize(Enum<?> value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
       try {
-        Enum<?> enumValue = (Enum<?>) writer.get(null);
-        VersionFilter enumVersionFilter = enumValue.getClass().getField(enumValue.name()).getAnnotation(VersionFilter.class);
-        if (enumVersionFilter != null && enumVersionFilter.value().compareTo(currentVersion) > 0) {
-          return false;
+        VersionFilter versionFilter = value.getClass().getField(value.name()).getAnnotation(VersionFilter.class);
+        if (versionFilter == null || versionFilter.value().compareTo(currentVersion) <= 0) {
+          defaultSerializer.serialize(value, gen, serializers);
         }
-      } catch (Exception e) {
-        // Handle exception
+      }catch (NoSuchFieldException e) {
+        defaultSerializer.serialize(value, gen, serializers);
       }
     }
-    return true;
   }
 }

src/test/java/org/cyclonedx/BomJsonGeneratorTest.java

@@ -211,11 +211,11 @@ private static Stream<Arguments> versionAndBomProvider() {
             Arguments.of(Version.VERSION_12, "/bom-1.5.json"),
 
             // Backward compatibility tests from BOM 1.6
-            Arguments.of(Version.VERSION_16, "/1.6/valid-bom-1.6.json"),
-            Arguments.of(Version.VERSION_15, "/1.6/valid-bom-1.6.json"),
-            Arguments.of(Version.VERSION_14, "/1.6/valid-bom-1.6.json"),
-            Arguments.of(Version.VERSION_13, "/1.6/valid-bom-1.6.json"),
-            Arguments.of(Version.VERSION_12, "/1.6/valid-bom-1.6.json")
+            Arguments.of(Version.VERSION_16, "/bom-1.6.json"),
+            Arguments.of(Version.VERSION_15, "/bom-1.6.json"),
+            Arguments.of(Version.VERSION_14, "/bom-1.6.json"),
+            Arguments.of(Version.VERSION_13, "/bom-1.6.json"),
+            Arguments.of(Version.VERSION_12, "/bom-1.6.json")
         );
     }
 
@@ -225,7 +225,7 @@ private static Stream<Arguments> versionAndBom() {
             Arguments.of(Version.VERSION_13, "/bom-1.3.json"),
             Arguments.of(Version.VERSION_14, "/bom-1.4.json"),
             Arguments.of(Version.VERSION_15, "/bom-1.5.json"),
-            Arguments.of(Version.VERSION_16, "/1.6/valid-bom-1.6.json")
+            Arguments.of(Version.VERSION_16, "/bom-1.6.json")
         );
     }
 

src/test/java/org/cyclonedx/BomXmlGeneratorTest.java

@@ -386,12 +386,12 @@ private static Stream<Arguments> versionAndBomProvider() {
             Arguments.of(Version.VERSION_11, "/bom-1.5.xml"),
 
             // Backward compatibility tests from BOM 1.5
-            Arguments.of(Version.VERSION_16, "/1.6/valid-bom-1.6.xml"),
-            Arguments.of(Version.VERSION_15, "/1.6/valid-bom-1.6.xml"),
-            Arguments.of(Version.VERSION_14, "/1.6/valid-bom-1.6.xml"),
-            Arguments.of(Version.VERSION_13, "/1.6/valid-bom-1.6.xml"),
-            Arguments.of(Version.VERSION_12, "/1.6/valid-bom-1.6.xml"),
-            Arguments.of(Version.VERSION_11, "/1.6/valid-bom-1.6.xml")
+            Arguments.of(Version.VERSION_16, "/bom-1.6.xml"),
+            Arguments.of(Version.VERSION_15, "/bom-1.6.xml"),
+            Arguments.of(Version.VERSION_14, "/bom-1.6.xml"),
+            Arguments.of(Version.VERSION_13, "/bom-1.6.xml"),
+            Arguments.of(Version.VERSION_12, "/bom-1.6.xml"),
+            Arguments.of(Version.VERSION_11, "/bom-1.6.xml")
         );
     }
 
@@ -654,7 +654,7 @@ private static Stream<Arguments> versionAndBom() {
             Arguments.of(Version.VERSION_13, "/bom-1.3.xml"),
             Arguments.of(Version.VERSION_14, "/bom-1.4.xml"),
             Arguments.of(Version.VERSION_15, "/bom-1.5.xml"),
-            Arguments.of(Version.VERSION_16, "/1.6/valid-bom-1.6.xml")
+            Arguments.of(Version.VERSION_16, "/bom-1.6.xml")
         );
     }
 

src/test/java/org/cyclonedx/parse/XmlParseTest.java

@@ -34,8 +34,8 @@ public Collection<DynamicTest> dynamicTestsWithCollection() {
         final List<File> files = getAllResources();
         final List<DynamicTest> dynamicTests = new ArrayList<>();
         for (final File file : files) {
-            if (file.getName().endsWith(".xml")) {
-                if (file.getName().startsWith("valid")) {
+            if (file.getName().endsWith("1.6.xml")) {
+                if (file.getName().startsWith("valid-machine")) {
                     //dynamicTests.add(DynamicTest.dynamicTest(file.getName(), () -> assertNotNull(parseBom(file))));
                     dynamicTests.add(DynamicTest.dynamicTest(file.getName(), () -> {
                         final Bom bom = parseBom(file);