[Java] Since version in the IR should be the result of the max of either the field or type rather than just letting the field take precedence.

Author: mjpt777

sbe-tool/src/main/java/uk/co/real_logic/sbe/xml/IrGenerator.java

@@ -221,7 +221,7 @@ private void add(final CompositeType type, final int currOffset, final Field fie
 
  if (field != null)
  {
- builder.version(field.sinceVersion());
+ builder.version(Math.max(field.sinceVersion(), type.sinceVersion()));
  }
 
  tokenList.add(builder.build());
@@ -283,7 +283,7 @@ private void add(final EnumType type, final int offset, final Field field)
 
  if (field != null)
  {
- builder.version(field.sinceVersion());
+ builder.version(Math.max(field.sinceVersion(), type.sinceVersion()));
  }
 
  tokenList.add(builder.build());
@@ -335,7 +335,7 @@ private void add(final SetType type, final int offset, final Field field)
 
  if (field != null)
  {
- builder.version(field.sinceVersion());
+ builder.version(Math.max(field.sinceVersion(), type.sinceVersion()));
  }
 
  tokenList.add(builder.build());
@@ -393,7 +393,7 @@ private void add(final EncodedDataType type, final int offset, final Field field
 
  if (field != null && !(field.type() instanceof CompositeType))
  {
- tokenBuilder.version(field.sinceVersion());
+ tokenBuilder.version(Math.max(field.sinceVersion(), type.sinceVersion()));
  tokenBuilder.deprecated(field.deprecated());
 
  final String description = field.description();