Commit 4ea2df02 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge remote-tracking branch 'origin/2026Q2_RC'

parents bddfe9b8 9c31cd98

pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
	<parent>

		<groupId>org.etsi.osl</groupId>

		<artifactId>org.etsi.osl.main</artifactId>

		<version>2025Q4</version>

		<version>2026Q2</version>

		<relativePath>../org.etsi.osl.main</relativePath>

	</parent>

src/main/java/org/etsi/osl/tmf/common/model/EValueType.java

+4 −3
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ public enum EValueType { 
	ENUM("ENUM"),

	TIMESTAMP("TIMESTAMP"),

	MAP("MAP"),

	OBJECT("OBJECT");

	OBJECT("OBJECT"),

	SECRET("SECRET");





	private String value;

src/main/java/org/etsi/osl/tmf/ri639/model/ResourceUpdate.java

+3 −0
Original line number Diff line number Diff line
@@ -454,6 +454,9 @@ public class ResourceUpdate { 
		val.setValue( aValue );

		val.setAlias( null );



		if (valueType != null)

			resCharacteristicItem.setValueType(valueType);

		

		resCharacteristicItem.setValue( val );

		

		this.addResourceCharacteristicItem( resCharacteristicItem );