From 67313cbbaae3fc183df9ca8206f0fb3d0124e8c7 Mon Sep 17 00:00:00 2001
From: alaskowski <alaskowski@ethz.ch>
Date: Thu, 16 Feb 2023 13:16:02 +0100
Subject: [PATCH] SSDM-13365: Updated copyright comments in lib-openbis-common

---
 .../source/java/ch/systemsx/cisd/hcs/Channel.java |  3 +--
 .../java/ch/systemsx/cisd/hcs/Geometry.java       |  3 +--
 .../java/ch/systemsx/cisd/hcs/Location.java       |  3 +--
 .../java/ch/systemsx/cisd/hcs/PlateGeometry.java  |  3 +--
 .../java/ch/systemsx/cisd/hcs/WellGeometry.java   |  3 +--
 .../HttpInvokerBasedServiceStubFactory.java       |  3 +--
 .../openbis/common/api/client/IServicePinger.java |  3 +--
 .../common/api/client/IServiceStubFactory.java    |  3 +--
 .../openbis/common/api/client/ServiceFinder.java  |  3 +--
 .../server/AbstractApiJsonServiceExporter.java    |  3 +--
 .../api/server/AbstractApiServiceExporter.java    |  3 +--
 ...bstractStreamSupportingApiServiceExporter.java |  3 +--
 .../common/api/server/RpcServiceNameServer.java   |  3 +--
 .../api/server/json/common/JsonConstants.java     |  3 +--
 .../deserializer/JsonDeserializerFactory.java     |  3 +--
 .../JsonTypeAndClassDeserializer.java             |  3 +--
 .../deserializer/JsonTypeAndClassSerializer.java  |  3 +--
 .../JsonTypeAndClassAnnotationIntrospector.java   |  3 +--
 .../mapping/IJsonBaseTypeToSubTypesMapping.java   |  3 +--
 .../IJsonClassValueToClassObjectsMapping.java     |  3 +--
 .../JsonReflectionsBaseTypeToSubTypesMapping.java |  3 +--
 ...JsonStaticClassValueToClassObjectsMapping.java |  3 +--
 .../server/json/resolver/JsonErrorResolver.java   | 15 +++++++++++++++
 .../resolver/JsonReflectionsSubTypeResolver.java  |  3 +--
 .../resolver/JsonTypeAndClassResolverBuilder.java |  3 +--
 .../json/serializer/JsonSerializerFactory.java    |  3 +--
 .../api/server/json/util/ClassReferences.java     |  3 +--
 .../conversation/annotation/Conversational.java   |  3 +--
 .../common/conversation/annotation/Progress.java  |  3 +--
 .../client/ServiceConversationClientDetails.java  |  3 +--
 ...onversationClientWithConversationTracking.java |  3 +--
 .../ServiceConversationsThreadContext.java        |  3 +--
 .../BaseServiceConversationClientManager.java     |  3 +--
 .../BaseServiceConversationServerManager.java     |  3 +--
 .../IServiceConversationClientManagerRemote.java  |  3 +--
 .../IServiceConversationServerManagerRemote.java  |  3 +--
 .../ServiceConversationServiceFactory.java        |  3 +--
 .../manager/ServiceConversationServiceProxy.java  |  3 +--
 .../ServiceConversationMethodInvocation.java      |  3 +--
 .../IServiceConversationProgressListener.java     |  3 +--
 ...viceConversationAutomaticProgressListener.java |  3 +--
 .../ServiceConversationNullProgressListener.java  |  3 +--
 ...ceConversationRateLimitedProgressListener.java |  3 +--
 .../cisd/openbis/common/hdf5/HDF5Container.java   |  3 +--
 .../openbis/common/hdf5/HDF5ContainerReader.java  |  3 +--
 .../openbis/common/hdf5/HDF5ContainerWriter.java  |  3 +--
 ...HierarchicalStructureDuplicatorFileToHDF5.java |  3 +--
 .../openbis/common/hdf5/IHDF5ContainerReader.java |  3 +--
 .../openbis/common/hdf5/IHDF5ContainerWriter.java |  3 +--
 .../common/io/ByteArrayBasedContentNode.java      |  3 +--
 .../common/io/ConcatenatedContentInputStream.java |  3 +--
 .../openbis/common/io/FileBasedContentNode.java   |  3 +--
 ...alContentNodeBasedHierarchicalContentNode.java |  3 +--
 .../AbstractHierarchicalContent.java              |  3 +--
 .../AbstractHierarchicalContentNode.java          |  3 +--
 .../AbstractHierarchicalDirectoryContentNode.java |  3 +--
 .../AbstractHierarchicalFileContentNode.java      |  3 +--
 .../DefaultFileBasedHierarchicalContent.java      |  3 +--
 ...efaultFileBasedHierarchicalContentFactory.java |  3 +--
 .../DefaultFileBasedHierarchicalContentNode.java  |  3 +--
 .../FilteredHierarchicalContent.java              |  3 +--
 .../io/hierarchical_content/H5FolderChecker.java  |  3 +--
 .../io/hierarchical_content/H5FolderFlags.java    |  3 +--
 ...HDF5ContainerBasedHierarchicalContentNode.java |  3 +--
 .../Hdf5AwareHierarchicalContentFactory.java      |  3 +--
 .../HierarchicalContentUtils.java                 |  3 +--
 .../IFileContentProvider.java                     |  3 +--
 .../IHierarchicalContentFactory.java              |  3 +--
 .../IHierarchicalContentNodeFilter.java           |  3 +--
 .../TarBasedHierarchicalContent.java              |  3 +--
 .../VirtualHierarchicalContent.java               |  3 +--
 .../ZipBasedHierarchicalContent.java              |  3 +--
 .../api/HierarchicalContentProxy.java             | 15 +++++++++++++++
 .../api/IHierarchicalContent.java                 |  3 +--
 .../api/IHierarchicalContentExecuteOnAccess.java  | 15 +++++++++++++++
 .../api/IHierarchicalContentNode.java             |  3 +--
 .../openbis/common/log/DefaultAppenderFilter.java |  3 +--
 .../openbis/common/log/ServiceCallAppender.java   |  3 +--
 .../logging/ServiceCallLogConfiguration.java      |  3 +--
 .../common/pat/IPersonalAccessTokenAware.java     | 15 +++++++++++++++
 .../pat/IPersonalAccessTokenInvocation.java       | 15 +++++++++++++++
 .../common/pat/PersonalAccessTokenAdvisor.java    |  3 +--
 .../pat/PersonalAccessTokenInterceptor.java       |  3 +--
 .../common/spring/AbstractServiceWithLogger.java  |  3 +--
 ...tionBeanPostProcessorIgnoringMissingBeans.java |  3 +--
 .../common/spring/IInvocationLoggerContext.java   |  3 +--
 .../common/spring/IInvocationLoggerFactory.java   |  3 +--
 .../common/spring/IUncheckedMultipartFile.java    |  3 +--
 .../cisd/openbis/common/spring/LogAdvisor.java    |  3 +--
 .../openbis/common/spring/LogInterceptor.java     |  3 +--
 .../cisd/openbis/common/spring/Logging.java       |  3 +--
 .../spring/MarkerLogApplicationListener.java      |  3 +--
 .../common/spring/MultipartFileAdapter.java       |  3 +--
 .../spring/PropertyPlaceholderConfigurer.java     |  3 +--
 .../spring/SpringEoDSQLExceptionTranslator.java   |  3 +--
 .../openbis/common/types/BooleanOrUnknown.java    |  3 +--
 .../cisd/openbis/test/server/TestDatabase.java    |  3 +--
 .../systemsx/cisd/openbis/common/DefaultTest.java |  3 +--
 .../openbis/common/DependencyCheckingTest.java    |  3 +--
 .../common/api/client/ServiceFinderTest.java      |  3 +--
 .../api/client/ServiceFinderTimeoutTest.java      |  3 +--
 .../openbis/common/api/server/JsonBaseTest.java   |  3 +--
 .../openbis/common/api/server/RpcServiceList.java |  3 +--
 .../api/server/json/ClassReferenceSearchTest.java |  3 +--
 .../api/server/json/JsonDeserializationTest.java  |  3 +--
 .../api/server/json/JsonSerializationTest.java    |  3 +--
 .../api/server/json/JsonTestObjectMapper.java     |  3 +--
 .../api/server/json/common/ObjectCounter.java     |  3 +--
 .../api/server/json/common/ObjectFactory.java     |  3 +--
 .../common/api/server/json/common/ObjectMap.java  |  3 +--
 .../common/api/server/json/common/ObjectType.java |  3 +--
 .../json/object/ObjectNestedChildFactory.java     |  3 +--
 .../server/json/object/ObjectNestedFactory.java   |  3 +--
 .../json/object/ObjectWithContainerTypes.java     |  3 +--
 .../object/ObjectWithContainerTypesFactory.java   |  3 +--
 .../ObjectWithContainerTypesFactoryAbstract.java  |  3 +--
 .../server/json/object/ObjectWithDateTypes.java   |  3 +--
 .../json/object/ObjectWithDateTypesFactory.java   |  3 +--
 .../server/json/object/ObjectWithEnumTypes.java   |  3 +--
 .../json/object/ObjectWithEnumTypesFactory.java   |  3 +--
 .../json/object/ObjectWithIgnoredProperties.java  |  3 +--
 .../ObjectWithIgnoredPropertiesFactory.java       |  3 +--
 .../object/ObjectWithKnownButNotUniqueClass.java  |  3 +--
 .../ObjectWithKnownButNotUniqueClassFactory.java  |  3 +--
 .../json/object/ObjectWithKnownTypeFactory.java   |  3 +--
 .../object/ObjectWithKnownUniqueClassFactory.java |  3 +--
 .../ObjectWithNestedMapsInCollectionFactory.java  |  3 +--
 .../object/ObjectWithNestedMapsInListFactory.java |  3 +--
 .../object/ObjectWithNestedMapsInMapFactory.java  |  3 +--
 .../server/json/object/ObjectWithNestedTypes.java |  3 +--
 .../json/object/ObjectWithNestedTypesFactory.java |  3 +--
 .../json/object/ObjectWithPrimitiveTypes.java     |  3 +--
 .../object/ObjectWithPrimitiveTypesFactory.java   |  3 +--
 .../json/object/ObjectWithPrivateAccess.java      |  3 +--
 .../object/ObjectWithPrivateAccessFactory.java    |  3 +--
 .../json/object/ObjectWithRenamedProperties.java  |  3 +--
 .../ObjectWithRenamedPropertiesFactory.java       |  3 +--
 .../json/object/ObjectWithReusedReferences.java   |  3 +--
 .../object/ObjectWithReusedReferencesFactory.java |  3 +--
 .../json/object/ObjectWithSelfReference.java      |  3 +--
 .../object/ObjectWithSelfReferenceFactory.java    |  3 +--
 .../api/server/json/object/ObjectWithType.java    | 15 +++++++++++++++
 .../api/server/json/object/ObjectWithTypeA.java   | 15 +++++++++++++++
 .../api/server/json/object/ObjectWithTypeAA.java  |  3 +--
 .../json/object/ObjectWithTypeAAFactory.java      |  3 +--
 .../json/object/ObjectWithTypeAFactory.java       |  3 +--
 .../object/ObjectWithTypeALegalDuplicate.java     | 15 +++++++++++++++
 .../api/server/json/object/ObjectWithTypeB.java   | 15 +++++++++++++++
 .../json/object/ObjectWithTypeBFactory.java       |  3 +--
 .../object/ObjectWithTypeBIllegalDuplicate.java   | 15 +++++++++++++++
 .../json/object/ObjectWithTypeButNoSubtypes.java  |  3 +--
 .../ObjectWithTypeButNoSubtypesFactory.java       |  3 +--
 .../api/server/json/object/ObjectWithTypeC.java   |  3 +--
 .../json/object/ObjectWithTypeCFactory.java       |  3 +--
 .../server/json/object/ObjectWithTypeFactory.java |  3 +--
 .../json/object/ObjectWithTypeInterface1.java     |  3 +--
 .../json/object/ObjectWithTypeInterface2.java     |  3 +--
 .../server/json/object/ObjectWithUnknownType.java |  3 +--
 .../json/object/ObjectWithUnknownTypeFactory.java |  3 +--
 .../cisd/openbis/common/eodsql/MockDataSet.java   |  3 +--
 .../hdf5/FileToHDF5DuplicationVerifier.java       |  3 +--
 .../openbis/common/hdf5/HDF5ContainerTest.java    |  3 +--
 ...archicalStructureDuplicatorFileToHDF5Test.java |  3 +--
 .../io/ConcatenatedContentInputStreamTest.java    |  3 +--
 .../AbstractHierarchicalContentNodeTest.java      |  3 +--
 ...stractPackageBasedHierarchicalContentTest.java |  3 +--
 ...ltFileBasedHierarchicalContentFactoryTest.java |  3 +--
 .../DefaultFileBasedHierarchicalContentTest.java  |  3 +--
 .../hierarchical_content/H5FolderCheckerTest.java |  3 +--
 ...ContainerBasedHierarchicalContentNodeTest.java |  3 +--
 .../TarBasedHierarchicalContentTest.java          |  3 +--
 .../VirtualHierarchicalContentTest.java           |  3 +--
 .../VirtualNodeMergingTest.java                   |  3 +--
 .../io/hierarchical_content/VirtualNodeTest.java  |  3 +--
 .../ZipBasedHierarchicalContentTest.java          |  3 +--
 .../logging/ServiceCallLogConfigurationTest.java  |  3 +--
 .../common/spring/AbstractActionLogTest.java      |  3 +--
 .../openbis/common/spring/SpringTestCase.java     |  3 +--
 .../cisd/openbis/common/spring/WaitAction.java    | 15 +++++++++++++++
 179 files changed, 333 insertions(+), 336 deletions(-)

diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/hcs/Channel.java b/lib-openbis-common/source/java/ch/systemsx/cisd/hcs/Channel.java
index 3212a823185..0d5c427f09c 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/hcs/Channel.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/hcs/Channel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.hcs;
 
 /**
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/hcs/Geometry.java b/lib-openbis-common/source/java/ch/systemsx/cisd/hcs/Geometry.java
index 39c542ef4c8..ed10e3d0760 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/hcs/Geometry.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/hcs/Geometry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.hcs;
 
 /**
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/hcs/Location.java b/lib-openbis-common/source/java/ch/systemsx/cisd/hcs/Location.java
index 80f0f6ff013..d488ec90986 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/hcs/Location.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/hcs/Location.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.hcs;
 
 import java.io.Serializable;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/hcs/PlateGeometry.java b/lib-openbis-common/source/java/ch/systemsx/cisd/hcs/PlateGeometry.java
index 8b78dfec9f4..12752112536 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/hcs/PlateGeometry.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/hcs/PlateGeometry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.hcs;
 
 /**
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/hcs/WellGeometry.java b/lib-openbis-common/source/java/ch/systemsx/cisd/hcs/WellGeometry.java
index 3d88e3e53bc..978a86cd96e 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/hcs/WellGeometry.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/hcs/WellGeometry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.hcs;
 
 /**
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/client/HttpInvokerBasedServiceStubFactory.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/client/HttpInvokerBasedServiceStubFactory.java
index fcd119c6bd1..1dff828a470 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/client/HttpInvokerBasedServiceStubFactory.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/client/HttpInvokerBasedServiceStubFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.client;
 
 import ch.systemsx.cisd.common.spring.HttpInvokerUtils;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/client/IServicePinger.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/client/IServicePinger.java
index eabeb13e638..c8be1694c78 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/client/IServicePinger.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/client/IServicePinger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.client;
 
 /**
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/client/IServiceStubFactory.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/client/IServiceStubFactory.java
index 88c3e676f80..64a0a9a08c6 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/client/IServiceStubFactory.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/client/IServiceStubFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.client;
 
 /**
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/client/ServiceFinder.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/client/ServiceFinder.java
index 0de7ca8db5a..f540f57f3db 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/client/ServiceFinder.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/client/ServiceFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.client;
 
 import java.io.File;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/AbstractApiJsonServiceExporter.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/AbstractApiJsonServiceExporter.java
index e0b93c9544d..5be417ad25f 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/AbstractApiJsonServiceExporter.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/AbstractApiJsonServiceExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server;
 
 import java.lang.reflect.Method;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/AbstractApiServiceExporter.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/AbstractApiServiceExporter.java
index c6128405d6e..d69aee4c0ef 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/AbstractApiServiceExporter.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/AbstractApiServiceExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server;
 
 import javax.annotation.Resource;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/AbstractStreamSupportingApiServiceExporter.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/AbstractStreamSupportingApiServiceExporter.java
index c4fe9936543..0627f90ca0b 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/AbstractStreamSupportingApiServiceExporter.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/AbstractStreamSupportingApiServiceExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server;
 
 import javax.annotation.Resource;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/RpcServiceNameServer.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/RpcServiceNameServer.java
index cd81d83d385..9617f4517c2 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/RpcServiceNameServer.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/RpcServiceNameServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server;
 
 import java.util.ArrayList;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/common/JsonConstants.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/common/JsonConstants.java
index f680160819c..9042ecf601f 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/common/JsonConstants.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/common/JsonConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.common;
 
 /**
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/deserializer/JsonDeserializerFactory.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/deserializer/JsonDeserializerFactory.java
index fa6c2d3c244..047776b6d78 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/deserializer/JsonDeserializerFactory.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/deserializer/JsonDeserializerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.deserializer;
 
 import java.io.IOException;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/deserializer/JsonTypeAndClassDeserializer.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/deserializer/JsonTypeAndClassDeserializer.java
index 9fd9eccc1c6..8e97ca28699 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/deserializer/JsonTypeAndClassDeserializer.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/deserializer/JsonTypeAndClassDeserializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.deserializer;
 
 import java.io.IOException;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/deserializer/JsonTypeAndClassSerializer.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/deserializer/JsonTypeAndClassSerializer.java
index fe00ce1c8e1..f046b434a8a 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/deserializer/JsonTypeAndClassSerializer.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/deserializer/JsonTypeAndClassSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.deserializer;
 
 import java.io.IOException;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/introspector/JsonTypeAndClassAnnotationIntrospector.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/introspector/JsonTypeAndClassAnnotationIntrospector.java
index b27735b9dda..2896e2820b0 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/introspector/JsonTypeAndClassAnnotationIntrospector.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/introspector/JsonTypeAndClassAnnotationIntrospector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.introspector;
 
 import java.util.HashMap;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/mapping/IJsonBaseTypeToSubTypesMapping.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/mapping/IJsonBaseTypeToSubTypesMapping.java
index 8c689393bbc..323ed52f82d 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/mapping/IJsonBaseTypeToSubTypesMapping.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/mapping/IJsonBaseTypeToSubTypesMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.mapping;
 
 import java.util.Set;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/mapping/IJsonClassValueToClassObjectsMapping.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/mapping/IJsonClassValueToClassObjectsMapping.java
index a0aefa58b80..2fd266c617b 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/mapping/IJsonClassValueToClassObjectsMapping.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/mapping/IJsonClassValueToClassObjectsMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.mapping;
 
 import java.util.List;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/mapping/JsonReflectionsBaseTypeToSubTypesMapping.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/mapping/JsonReflectionsBaseTypeToSubTypesMapping.java
index 3d580d71a63..6c3564bd089 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/mapping/JsonReflectionsBaseTypeToSubTypesMapping.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/mapping/JsonReflectionsBaseTypeToSubTypesMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.mapping;
 
 import java.net.URL;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/mapping/JsonStaticClassValueToClassObjectsMapping.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/mapping/JsonStaticClassValueToClassObjectsMapping.java
index e81d5dfc975..9653612a724 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/mapping/JsonStaticClassValueToClassObjectsMapping.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/mapping/JsonStaticClassValueToClassObjectsMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.mapping;
 
 import java.util.ArrayList;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/resolver/JsonErrorResolver.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/resolver/JsonErrorResolver.java
index f84bacceb12..b695f460fa6 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/resolver/JsonErrorResolver.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/resolver/JsonErrorResolver.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2021 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.common.api.server.json.resolver;
 
 import java.io.PrintWriter;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/resolver/JsonReflectionsSubTypeResolver.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/resolver/JsonReflectionsSubTypeResolver.java
index e46bd4d2f25..6cd9570e5df 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/resolver/JsonReflectionsSubTypeResolver.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/resolver/JsonReflectionsSubTypeResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.resolver;
 
 import java.util.Collection;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/resolver/JsonTypeAndClassResolverBuilder.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/resolver/JsonTypeAndClassResolverBuilder.java
index 5f4aeedd817..bad73ca67f4 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/resolver/JsonTypeAndClassResolverBuilder.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/resolver/JsonTypeAndClassResolverBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.resolver;
 
 import java.util.Collection;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/serializer/JsonSerializerFactory.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/serializer/JsonSerializerFactory.java
index f561dcca0a3..f025defdaaa 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/serializer/JsonSerializerFactory.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/serializer/JsonSerializerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.serializer;
 
 import java.util.Collection;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/util/ClassReferences.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/util/ClassReferences.java
index 4f743bb149a..533eb203086 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/util/ClassReferences.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/util/ClassReferences.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.util;
 
 import java.lang.reflect.Method;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/annotation/Conversational.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/annotation/Conversational.java
index 6c23b0eda59..c7652a0eb09 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/annotation/Conversational.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/annotation/Conversational.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.conversation.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/annotation/Progress.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/annotation/Progress.java
index 760af6b5897..3638a7a132e 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/annotation/Progress.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/annotation/Progress.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.conversation.annotation;
 
 /**
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/client/ServiceConversationClientDetails.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/client/ServiceConversationClientDetails.java
index dacbe4463ff..0ae14dcd071 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/client/ServiceConversationClientDetails.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/client/ServiceConversationClientDetails.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.conversation.client;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/client/ServiceConversationClientWithConversationTracking.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/client/ServiceConversationClientWithConversationTracking.java
index dd0a5035f1f..e8e2f6d19ff 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/client/ServiceConversationClientWithConversationTracking.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/client/ServiceConversationClientWithConversationTracking.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.conversation.client;
 
 import ch.systemsx.cisd.common.serviceconversation.ServiceConversationDTO;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/context/ServiceConversationsThreadContext.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/context/ServiceConversationsThreadContext.java
index 7677c013d0e..a672107400a 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/context/ServiceConversationsThreadContext.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/context/ServiceConversationsThreadContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.conversation.context;
 
 import ch.systemsx.cisd.openbis.common.conversation.progress.IServiceConversationProgressListener;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/manager/BaseServiceConversationClientManager.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/manager/BaseServiceConversationClientManager.java
index cd887cc83be..33a5bc67ef4 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/manager/BaseServiceConversationClientManager.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/manager/BaseServiceConversationClientManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.conversation.manager;
 
 import java.util.Collections;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/manager/BaseServiceConversationServerManager.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/manager/BaseServiceConversationServerManager.java
index 621d8cae1ba..083914fed15 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/manager/BaseServiceConversationServerManager.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/manager/BaseServiceConversationServerManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.conversation.manager;
 
 import java.util.Collections;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/manager/IServiceConversationClientManagerRemote.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/manager/IServiceConversationClientManagerRemote.java
index 97d9689b51f..489d39a24c9 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/manager/IServiceConversationClientManagerRemote.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/manager/IServiceConversationClientManagerRemote.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.conversation.manager;
 
 import ch.systemsx.cisd.common.serviceconversation.IServiceMessageTransport;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/manager/IServiceConversationServerManagerRemote.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/manager/IServiceConversationServerManagerRemote.java
index 645848a400d..27a176097b2 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/manager/IServiceConversationServerManagerRemote.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/manager/IServiceConversationServerManagerRemote.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.conversation.manager;
 
 import ch.systemsx.cisd.common.serviceconversation.IServiceMessageTransport;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/manager/ServiceConversationServiceFactory.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/manager/ServiceConversationServiceFactory.java
index 21f8db9eefa..17639889239 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/manager/ServiceConversationServiceFactory.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/manager/ServiceConversationServiceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.conversation.manager;
 
 import java.io.Serializable;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/manager/ServiceConversationServiceProxy.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/manager/ServiceConversationServiceProxy.java
index 758f7b87802..956e5ecd897 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/manager/ServiceConversationServiceProxy.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/manager/ServiceConversationServiceProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.conversation.manager;
 
 import java.io.Serializable;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/message/ServiceConversationMethodInvocation.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/message/ServiceConversationMethodInvocation.java
index 133e34eca1d..cfa81d23b20 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/message/ServiceConversationMethodInvocation.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/message/ServiceConversationMethodInvocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.conversation.message;
 
 import java.io.Serializable;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/progress/IServiceConversationProgressListener.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/progress/IServiceConversationProgressListener.java
index 3e6450ebe06..4eb4346493f 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/progress/IServiceConversationProgressListener.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/progress/IServiceConversationProgressListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.conversation.progress;
 
 /**
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/progress/ServiceConversationAutomaticProgressListener.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/progress/ServiceConversationAutomaticProgressListener.java
index 7db8f82dce4..0290358298d 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/progress/ServiceConversationAutomaticProgressListener.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/progress/ServiceConversationAutomaticProgressListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.conversation.progress;
 
 import java.lang.reflect.Method;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/progress/ServiceConversationNullProgressListener.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/progress/ServiceConversationNullProgressListener.java
index 305c9d703ef..23871158011 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/progress/ServiceConversationNullProgressListener.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/progress/ServiceConversationNullProgressListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.conversation.progress;
 
 /**
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/progress/ServiceConversationRateLimitedProgressListener.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/progress/ServiceConversationRateLimitedProgressListener.java
index a46b350a08f..f8b287e9e46 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/progress/ServiceConversationRateLimitedProgressListener.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/conversation/progress/ServiceConversationRateLimitedProgressListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.conversation.progress;
 
 import java.util.concurrent.ScheduledFuture;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/hdf5/HDF5Container.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/hdf5/HDF5Container.java
index 40f0b828b2c..0b49bb343fa 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/hdf5/HDF5Container.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/hdf5/HDF5Container.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.hdf5;
 
 import java.io.File;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/hdf5/HDF5ContainerReader.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/hdf5/HDF5ContainerReader.java
index 16ff4958835..406abc6328b 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/hdf5/HDF5ContainerReader.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/hdf5/HDF5ContainerReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.hdf5;
 
 import java.io.File;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/hdf5/HDF5ContainerWriter.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/hdf5/HDF5ContainerWriter.java
index 4338164168f..7a5032c008a 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/hdf5/HDF5ContainerWriter.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/hdf5/HDF5ContainerWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.hdf5;
 
 import java.io.File;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/hdf5/HierarchicalStructureDuplicatorFileToHDF5.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/hdf5/HierarchicalStructureDuplicatorFileToHDF5.java
index cdf4fef0ab0..d2e97a2a4a5 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/hdf5/HierarchicalStructureDuplicatorFileToHDF5.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/hdf5/HierarchicalStructureDuplicatorFileToHDF5.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.hdf5;
 
 import java.io.File;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/hdf5/IHDF5ContainerReader.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/hdf5/IHDF5ContainerReader.java
index 8d52357a05b..07ac0346c7c 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/hdf5/IHDF5ContainerReader.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/hdf5/IHDF5ContainerReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.hdf5;
 
 import java.io.OutputStream;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/hdf5/IHDF5ContainerWriter.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/hdf5/IHDF5ContainerWriter.java
index fb481d23a2e..814860af7df 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/hdf5/IHDF5ContainerWriter.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/hdf5/IHDF5ContainerWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.hdf5;
 
 import java.io.File;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/ByteArrayBasedContentNode.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/ByteArrayBasedContentNode.java
index 7d375d385cd..b7a68e29cf3 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/ByteArrayBasedContentNode.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/ByteArrayBasedContentNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io;
 
 import java.io.ByteArrayInputStream;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/ConcatenatedContentInputStream.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/ConcatenatedContentInputStream.java
index 6004ad03008..6cb75eb94ca 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/ConcatenatedContentInputStream.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/ConcatenatedContentInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io;
 
 import java.io.BufferedInputStream;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/FileBasedContentNode.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/FileBasedContentNode.java
index ac46512fd43..9271c039a38 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/FileBasedContentNode.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/FileBasedContentNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io;
 
 import java.io.BufferedInputStream;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/HierarchicalContentNodeBasedHierarchicalContentNode.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/HierarchicalContentNodeBasedHierarchicalContentNode.java
index 48a13d69bb7..edf2c8e325e 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/HierarchicalContentNodeBasedHierarchicalContentNode.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/HierarchicalContentNodeBasedHierarchicalContentNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io;
 
 import java.io.File;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/AbstractHierarchicalContent.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/AbstractHierarchicalContent.java
index 87388aa8882..8201ed93beb 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/AbstractHierarchicalContent.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/AbstractHierarchicalContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.util.ArrayList;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/AbstractHierarchicalContentNode.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/AbstractHierarchicalContentNode.java
index 5b684746ea9..c6241bc3f13 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/AbstractHierarchicalContentNode.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/AbstractHierarchicalContentNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.io.InputStream;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/AbstractHierarchicalDirectoryContentNode.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/AbstractHierarchicalDirectoryContentNode.java
index 971f75fc59d..5ee65a8a91b 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/AbstractHierarchicalDirectoryContentNode.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/AbstractHierarchicalDirectoryContentNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.io.InputStream;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/AbstractHierarchicalFileContentNode.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/AbstractHierarchicalFileContentNode.java
index 7cc20c1f3a5..bba7fc0234c 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/AbstractHierarchicalFileContentNode.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/AbstractHierarchicalFileContentNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.util.List;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/DefaultFileBasedHierarchicalContent.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/DefaultFileBasedHierarchicalContent.java
index a29276536e1..b515e96eb6c 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/DefaultFileBasedHierarchicalContent.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/DefaultFileBasedHierarchicalContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.io.File;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentFactory.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentFactory.java
index 421d062e09f..77407ba4c44 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentFactory.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.io.File;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentNode.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentNode.java
index eb15074047f..e3185d1709a 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentNode.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.io.File;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/FilteredHierarchicalContent.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/FilteredHierarchicalContent.java
index 7eee6fadfa7..79c8a74a9b8 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/FilteredHierarchicalContent.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/FilteredHierarchicalContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.io.File;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/H5FolderChecker.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/H5FolderChecker.java
index 6c21c069f1c..9cb876cdb9a 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/H5FolderChecker.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/H5FolderChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.util.HashMap;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/H5FolderFlags.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/H5FolderFlags.java
index 37810533cd6..c4daba4ea0b 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/H5FolderFlags.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/H5FolderFlags.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 /**
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/HDF5ContainerBasedHierarchicalContentNode.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/HDF5ContainerBasedHierarchicalContentNode.java
index 5988d40cd44..4217a013346 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/HDF5ContainerBasedHierarchicalContentNode.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/HDF5ContainerBasedHierarchicalContentNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.io.Closeable;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/Hdf5AwareHierarchicalContentFactory.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/Hdf5AwareHierarchicalContentFactory.java
index a76724fc180..5cb47ecb9b0 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/Hdf5AwareHierarchicalContentFactory.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/Hdf5AwareHierarchicalContentFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.io.File;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/HierarchicalContentUtils.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/HierarchicalContentUtils.java
index 2ec4da4d813..5808e68958c 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/HierarchicalContentUtils.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/HierarchicalContentUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.io.FilterInputStream;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/IFileContentProvider.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/IFileContentProvider.java
index 3ac29383227..499d0ace785 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/IFileContentProvider.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/IFileContentProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.io.InputStream;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/IHierarchicalContentFactory.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/IHierarchicalContentFactory.java
index 177d88b085f..707e0656a8c 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/IHierarchicalContentFactory.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/IHierarchicalContentFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.io.File;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/IHierarchicalContentNodeFilter.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/IHierarchicalContentNodeFilter.java
index 8560b487ceb..e4c5381d587 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/IHierarchicalContentNodeFilter.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/IHierarchicalContentNodeFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContentNode;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/TarBasedHierarchicalContent.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/TarBasedHierarchicalContent.java
index dfa631da1c7..27a73813130 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/TarBasedHierarchicalContent.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/TarBasedHierarchicalContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.io.File;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/VirtualHierarchicalContent.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/VirtualHierarchicalContent.java
index ffc77e30b5f..5bb30f6810d 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/VirtualHierarchicalContent.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/VirtualHierarchicalContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.io.File;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/ZipBasedHierarchicalContent.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/ZipBasedHierarchicalContent.java
index 15aa38fa6a5..9fab482d930 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/ZipBasedHierarchicalContent.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/ZipBasedHierarchicalContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.io.BufferedOutputStream;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/api/HierarchicalContentProxy.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/api/HierarchicalContentProxy.java
index b24edb1396b..f5decfdf236 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/api/HierarchicalContentProxy.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/api/HierarchicalContentProxy.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content.api;
 
 import java.util.ArrayList;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/api/IHierarchicalContent.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/api/IHierarchicalContent.java
index 3cd76bf1fdf..1684549ecb7 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/api/IHierarchicalContent.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/api/IHierarchicalContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content.api;
 
 import java.util.List;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/api/IHierarchicalContentExecuteOnAccess.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/api/IHierarchicalContentExecuteOnAccess.java
index ffff349a162..f5aab7a5351 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/api/IHierarchicalContentExecuteOnAccess.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/api/IHierarchicalContentExecuteOnAccess.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content.api;
 
 public interface IHierarchicalContentExecuteOnAccess
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/api/IHierarchicalContentNode.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/api/IHierarchicalContentNode.java
index 9ac0f80c95c..f75b7d58201 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/api/IHierarchicalContentNode.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/api/IHierarchicalContentNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content.api;
 
 import java.io.File;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/log/DefaultAppenderFilter.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/log/DefaultAppenderFilter.java
index d92470039ee..8f47938a695 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/log/DefaultAppenderFilter.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/log/DefaultAppenderFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.log;
 
 import org.apache.log4j.spi.Filter;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/log/ServiceCallAppender.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/log/ServiceCallAppender.java
index 450eef4aa9a..fe794e19a07 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/log/ServiceCallAppender.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/log/ServiceCallAppender.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.log;
 
 import org.apache.log4j.DailyRollingFileAppender;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/logging/ServiceCallLogConfiguration.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/logging/ServiceCallLogConfiguration.java
index 46be17fcb5c..f52319bfed0 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/logging/ServiceCallLogConfiguration.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/logging/ServiceCallLogConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.logging;
 
 import ch.systemsx.cisd.common.logging.ControlFileBasedLogConfiguration;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/pat/IPersonalAccessTokenAware.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/pat/IPersonalAccessTokenAware.java
index 107c5765b00..b9133c47c97 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/pat/IPersonalAccessTokenAware.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/pat/IPersonalAccessTokenAware.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2022 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.common.pat;
 
 public interface IPersonalAccessTokenAware
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/pat/IPersonalAccessTokenInvocation.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/pat/IPersonalAccessTokenInvocation.java
index 677a6ba55bd..18ee473e177 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/pat/IPersonalAccessTokenInvocation.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/pat/IPersonalAccessTokenInvocation.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2022 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.common.pat;
 
 public interface IPersonalAccessTokenInvocation
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/pat/PersonalAccessTokenAdvisor.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/pat/PersonalAccessTokenAdvisor.java
index 8eda113eec1..dbaeb061d60 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/pat/PersonalAccessTokenAdvisor.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/pat/PersonalAccessTokenAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.pat;
 
 import org.aopalliance.aop.Advice;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/pat/PersonalAccessTokenInterceptor.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/pat/PersonalAccessTokenInterceptor.java
index 124da9b9002..78c4d700c4e 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/pat/PersonalAccessTokenInterceptor.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/pat/PersonalAccessTokenInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2022 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.pat;
 
 import java.io.Serializable;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/AbstractServiceWithLogger.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/AbstractServiceWithLogger.java
index 9d95a4626cf..730b4e68115 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/AbstractServiceWithLogger.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/AbstractServiceWithLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.spring;
 
 import org.apache.log4j.Logger;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/AnnotationBeanPostProcessorIgnoringMissingBeans.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/AnnotationBeanPostProcessorIgnoringMissingBeans.java
index d8f954d0288..ba62981c96c 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/AnnotationBeanPostProcessorIgnoringMissingBeans.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/AnnotationBeanPostProcessorIgnoringMissingBeans.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.spring;
 
 import org.apache.log4j.Logger;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/IInvocationLoggerContext.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/IInvocationLoggerContext.java
index 9ef9796e404..91cf3f71eb5 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/IInvocationLoggerContext.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/IInvocationLoggerContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.spring;
 
 /**
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/IInvocationLoggerFactory.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/IInvocationLoggerFactory.java
index 48d0c055c95..8c272100967 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/IInvocationLoggerFactory.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/IInvocationLoggerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.spring;
 
 /**
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/IUncheckedMultipartFile.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/IUncheckedMultipartFile.java
index 9a8b73daf36..a279414d3b2 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/IUncheckedMultipartFile.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/IUncheckedMultipartFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.spring;
 
 import java.io.File;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/LogAdvisor.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/LogAdvisor.java
index a9fa04b2d78..b411cba46d0 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/LogAdvisor.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/LogAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.spring;
 
 import org.aopalliance.aop.Advice;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/LogInterceptor.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/LogInterceptor.java
index cb37068b4d3..44f8ea95730 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/LogInterceptor.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/LogInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.spring;
 
 import java.io.Serializable;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/Logging.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/Logging.java
index 351fa1a5cfd..b597bf060d0 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/Logging.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/Logging.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.spring;
 
 import java.lang.annotation.ElementType;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/MarkerLogApplicationListener.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/MarkerLogApplicationListener.java
index 6defe39004a..ec165821b80 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/MarkerLogApplicationListener.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/MarkerLogApplicationListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.spring;
 
 import java.io.File;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/MultipartFileAdapter.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/MultipartFileAdapter.java
index 0fac4060bb6..e6f091b5da3 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/MultipartFileAdapter.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/MultipartFileAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.spring;
 
 import java.io.File;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/PropertyPlaceholderConfigurer.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/PropertyPlaceholderConfigurer.java
index 2733b709af4..16367ca94f9 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/PropertyPlaceholderConfigurer.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/PropertyPlaceholderConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.spring;
 
 import java.util.Properties;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/SpringEoDSQLExceptionTranslator.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/SpringEoDSQLExceptionTranslator.java
index 62d8a6eda69..2d8aed523cc 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/SpringEoDSQLExceptionTranslator.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/spring/SpringEoDSQLExceptionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.spring;
 
 import java.sql.Connection;
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/types/BooleanOrUnknown.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/types/BooleanOrUnknown.java
index 012cdb1ee31..6358d936cce 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/types/BooleanOrUnknown.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/common/types/BooleanOrUnknown.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.types;
 
 /**
diff --git a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/test/server/TestDatabase.java b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/test/server/TestDatabase.java
index 0e4c7def5cc..778b0d254c0 100644
--- a/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/test/server/TestDatabase.java
+++ b/lib-openbis-common/source/java/ch/systemsx/cisd/openbis/test/server/TestDatabase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.test.server;
 
 import java.io.File;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/DefaultTest.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/DefaultTest.java
index 907f71657d1..f01203d51e6 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/DefaultTest.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/DefaultTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common;
 
 import org.testng.Assert;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/DependencyCheckingTest.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/DependencyCheckingTest.java
index b1eee07f60e..852f1dca0b7 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/DependencyCheckingTest.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/DependencyCheckingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common;
 
 /**
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/client/ServiceFinderTest.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/client/ServiceFinderTest.java
index 9c6f933cfeb..f91c33e9ff7 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/client/ServiceFinderTest.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/client/ServiceFinderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.client;
 
 import org.apache.commons.lang3.time.DateUtils;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/client/ServiceFinderTimeoutTest.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/client/ServiceFinderTimeoutTest.java
index 06bde6a405a..90dd1797b74 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/client/ServiceFinderTimeoutTest.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/client/ServiceFinderTimeoutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.client;
 
 import java.io.InputStream;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/JsonBaseTest.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/JsonBaseTest.java
index f48ae5b31df..0ea252af6db 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/JsonBaseTest.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/JsonBaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/RpcServiceList.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/RpcServiceList.java
index 2efa7ed497e..e306fbeca18 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/RpcServiceList.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/RpcServiceList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server;
 
 import java.util.Collection;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/ClassReferenceSearchTest.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/ClassReferenceSearchTest.java
index d4d8fd3b066..f809f828c2c 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/ClassReferenceSearchTest.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/ClassReferenceSearchTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/JsonDeserializationTest.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/JsonDeserializationTest.java
index a8013c6db73..c2b6f275c2c 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/JsonDeserializationTest.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/JsonDeserializationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json;
 
 import java.util.Collection;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/JsonSerializationTest.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/JsonSerializationTest.java
index f999b143e24..1a944bc114e 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/JsonSerializationTest.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/JsonSerializationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json;
 
 import static org.testng.Assert.assertEquals;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/JsonTestObjectMapper.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/JsonTestObjectMapper.java
index f21dc0e503d..33e592be96d 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/JsonTestObjectMapper.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/JsonTestObjectMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json;
 
 import com.fasterxml.jackson.databind.MapperFeature;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/common/ObjectCounter.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/common/ObjectCounter.java
index 5b0c35ce504..ae2e7b33a05 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/common/ObjectCounter.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/common/ObjectCounter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.common;
 
 /**
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/common/ObjectFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/common/ObjectFactory.java
index a503016d617..c5bad40ab5d 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/common/ObjectFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/common/ObjectFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.common;
 
 import java.util.Map;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/common/ObjectMap.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/common/ObjectMap.java
index 2304edc7619..154cf8387e6 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/common/ObjectMap.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/common/ObjectMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.common;
 
 import java.util.LinkedHashMap;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/common/ObjectType.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/common/ObjectType.java
index 33cf3d232a7..14f74102f13 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/common/ObjectType.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/common/ObjectType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.common;
 
 /**
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectNestedChildFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectNestedChildFactory.java
index a9ef7f7163c..6e8ffaf5957 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectNestedChildFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectNestedChildFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import static ch.systemsx.cisd.openbis.common.api.server.json.object.ObjectNestedFactory.NESTED;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectNestedFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectNestedFactory.java
index 395c73f57f1..59b094bb994 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectNestedFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectNestedFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import java.util.Map;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithContainerTypes.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithContainerTypes.java
index 479198fde2d..5d76eb1e500 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithContainerTypes.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithContainerTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import java.util.Collection;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithContainerTypesFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithContainerTypesFactory.java
index f4f4be8b1ef..4b6d4c681a9 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithContainerTypesFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithContainerTypesFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import java.util.ArrayList;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithContainerTypesFactoryAbstract.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithContainerTypesFactoryAbstract.java
index 7814aeaa69d..4b43e6fb00d 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithContainerTypesFactoryAbstract.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithContainerTypesFactoryAbstract.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import java.util.Collection;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithDateTypes.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithDateTypes.java
index 373fcca2bb1..4c55d2b951c 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithDateTypes.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithDateTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithDateTypesFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithDateTypesFactory.java
index 60c2ac370b4..e8a4cda60c2 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithDateTypesFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithDateTypesFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import java.util.Map;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithEnumTypes.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithEnumTypes.java
index 03b5df3a211..908104ac20a 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithEnumTypes.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithEnumTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import java.util.EnumMap;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithEnumTypesFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithEnumTypesFactory.java
index f106b26289c..1dd8616855c 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithEnumTypesFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithEnumTypesFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import java.util.Collections;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithIgnoredProperties.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithIgnoredProperties.java
index 2766a8f0506..59e5b151491 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithIgnoredProperties.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithIgnoredProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithIgnoredPropertiesFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithIgnoredPropertiesFactory.java
index 2555550e636..b73c8292eaf 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithIgnoredPropertiesFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithIgnoredPropertiesFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import ch.systemsx.cisd.openbis.common.api.server.json.common.ObjectCounter;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithKnownButNotUniqueClass.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithKnownButNotUniqueClass.java
index 9919a9db5a4..6865df88826 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithKnownButNotUniqueClass.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithKnownButNotUniqueClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithKnownButNotUniqueClassFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithKnownButNotUniqueClassFactory.java
index 9d72caff873..b7eb2244e3f 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithKnownButNotUniqueClassFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithKnownButNotUniqueClassFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import static ch.systemsx.cisd.openbis.common.api.server.json.object.ObjectWithTypeFactory.BASE;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithKnownTypeFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithKnownTypeFactory.java
index 1048c3cde4c..0fa850df420 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithKnownTypeFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithKnownTypeFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import static ch.systemsx.cisd.openbis.common.api.server.json.object.ObjectWithTypeAFactory.A;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithKnownUniqueClassFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithKnownUniqueClassFactory.java
index 983b35f0848..5faa1a55f7b 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithKnownUniqueClassFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithKnownUniqueClassFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import static ch.systemsx.cisd.openbis.common.api.server.json.object.ObjectWithTypeAAFactory.AA;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithNestedMapsInCollectionFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithNestedMapsInCollectionFactory.java
index 9bf82beb8e1..6ce62a9c84c 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithNestedMapsInCollectionFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithNestedMapsInCollectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import java.util.ArrayList;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithNestedMapsInListFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithNestedMapsInListFactory.java
index c42dbc864bc..6c6e9b9cbba 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithNestedMapsInListFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithNestedMapsInListFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import java.util.ArrayList;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithNestedMapsInMapFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithNestedMapsInMapFactory.java
index 0f8aa6cc103..1f9b2ee72ee 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithNestedMapsInMapFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithNestedMapsInMapFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import java.util.HashMap;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithNestedTypes.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithNestedTypes.java
index 9f54bf082f9..c8e7e5f3806 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithNestedTypes.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithNestedTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithNestedTypesFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithNestedTypesFactory.java
index a4ff86c5da7..77959e66325 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithNestedTypesFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithNestedTypesFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import java.util.Map;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithPrimitiveTypes.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithPrimitiveTypes.java
index b5df879d1c9..0ad3126c2c7 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithPrimitiveTypes.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithPrimitiveTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithPrimitiveTypesFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithPrimitiveTypesFactory.java
index c75d04b492f..3c709694fdb 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithPrimitiveTypesFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithPrimitiveTypesFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import java.util.Map;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithPrivateAccess.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithPrivateAccess.java
index 3f0860b7d1b..1f6e6b6b3a8 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithPrivateAccess.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithPrivateAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithPrivateAccessFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithPrivateAccessFactory.java
index a915a66b44b..cd5b5c0764b 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithPrivateAccessFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithPrivateAccessFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import java.util.Map;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithRenamedProperties.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithRenamedProperties.java
index ed27cb272c9..36c1e69cb75 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithRenamedProperties.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithRenamedProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithRenamedPropertiesFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithRenamedPropertiesFactory.java
index 38515187179..71113fbbf70 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithRenamedPropertiesFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithRenamedPropertiesFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import java.util.Map;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithReusedReferences.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithReusedReferences.java
index 984bc91bb78..715a8811151 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithReusedReferences.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithReusedReferences.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithReusedReferencesFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithReusedReferencesFactory.java
index 81df74e89e5..50bb34130d6 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithReusedReferencesFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithReusedReferencesFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import java.util.Map;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithSelfReference.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithSelfReference.java
index 57248a68ad1..e6e6de713bf 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithSelfReference.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithSelfReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithSelfReferenceFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithSelfReferenceFactory.java
index 205f8771371..bdf0c639f99 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithSelfReferenceFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithSelfReferenceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import java.util.Map;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithType.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithType.java
index 926798c9662..30556e6d585 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithType.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithType.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeA.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeA.java
index 583ae651516..afacfdf574d 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeA.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeA.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeAA.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeAA.java
index 498d3d7e017..039f46ead6d 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeAA.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeAA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeAAFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeAAFactory.java
index f6bdf3db791..f66630ebbf0 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeAAFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeAAFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import static ch.systemsx.cisd.openbis.common.api.server.json.object.ObjectWithTypeAFactory.A;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeAFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeAFactory.java
index 0faccc15943..05f78a153db 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeAFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeAFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import static ch.systemsx.cisd.openbis.common.api.server.json.object.ObjectWithTypeFactory.BASE;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeALegalDuplicate.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeALegalDuplicate.java
index 0ac4b10828d..c2c9aaf3b23 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeALegalDuplicate.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeALegalDuplicate.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeB.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeB.java
index 36b1cf0c127..ccd626c718c 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeB.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeB.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeBFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeBFactory.java
index e376e38cb30..293e3f4f1d9 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeBFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeBFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import static ch.systemsx.cisd.openbis.common.api.server.json.object.ObjectWithTypeFactory.BASE;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeBIllegalDuplicate.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeBIllegalDuplicate.java
index 3e69b5e043d..ac04d8b7628 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeBIllegalDuplicate.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeBIllegalDuplicate.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeButNoSubtypes.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeButNoSubtypes.java
index b4b35e02514..5d6fc516e6e 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeButNoSubtypes.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeButNoSubtypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeButNoSubtypesFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeButNoSubtypesFactory.java
index 8850e1d77d6..009c92a075c 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeButNoSubtypesFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeButNoSubtypesFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import java.util.Map;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeC.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeC.java
index 22e0b787cb6..c18b3cef701 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeC.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeC.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeCFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeCFactory.java
index 6bcd36813d3..2cd308bd7cc 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeCFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeCFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import static ch.systemsx.cisd.openbis.common.api.server.json.object.ObjectWithTypeFactory.BASE;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeFactory.java
index 15ae729e751..34c5f7d28f8 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import java.util.Map;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeInterface1.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeInterface1.java
index 30923933a41..4439d7db754 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeInterface1.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeInterface1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeInterface2.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeInterface2.java
index ce540973aed..928886ce9c8 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeInterface2.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithTypeInterface2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithUnknownType.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithUnknownType.java
index ab01454ac13..f42323b051f 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithUnknownType.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithUnknownType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithUnknownTypeFactory.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithUnknownTypeFactory.java
index f9f73decf99..8b67fef4da5 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithUnknownTypeFactory.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/object/ObjectWithUnknownTypeFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.api.server.json.object;
 
 import ch.systemsx.cisd.openbis.common.api.server.json.common.ObjectCounter;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/eodsql/MockDataSet.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/eodsql/MockDataSet.java
index d239a5137ef..eec5650acee 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/eodsql/MockDataSet.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/eodsql/MockDataSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.eodsql;
 
 import java.util.ArrayList;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/hdf5/FileToHDF5DuplicationVerifier.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/hdf5/FileToHDF5DuplicationVerifier.java
index a219271ab27..66e75a41647 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/hdf5/FileToHDF5DuplicationVerifier.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/hdf5/FileToHDF5DuplicationVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.hdf5;
 
 import java.io.ByteArrayOutputStream;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/hdf5/HDF5ContainerTest.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/hdf5/HDF5ContainerTest.java
index 66a6b1898ce..e7e9dddf43f 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/hdf5/HDF5ContainerTest.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/hdf5/HDF5ContainerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.hdf5;
 
 import java.io.ByteArrayInputStream;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/hdf5/HierarchicalStructureDuplicatorFileToHDF5Test.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/hdf5/HierarchicalStructureDuplicatorFileToHDF5Test.java
index 58b67ac6392..caa40199a14 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/hdf5/HierarchicalStructureDuplicatorFileToHDF5Test.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/hdf5/HierarchicalStructureDuplicatorFileToHDF5Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.hdf5;
 
 import java.io.File;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/ConcatenatedContentInputStreamTest.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/ConcatenatedContentInputStreamTest.java
index e18482c6b2c..24f7d49caf3 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/ConcatenatedContentInputStreamTest.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/ConcatenatedContentInputStreamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io;
 
 import java.io.ByteArrayOutputStream;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/AbstractHierarchicalContentNodeTest.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/AbstractHierarchicalContentNodeTest.java
index 33d4378f270..249e3b3bfb0 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/AbstractHierarchicalContentNodeTest.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/AbstractHierarchicalContentNodeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.io.File;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/AbstractPackageBasedHierarchicalContentTest.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/AbstractPackageBasedHierarchicalContentTest.java
index eb5670e84c1..469a5be66ef 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/AbstractPackageBasedHierarchicalContentTest.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/AbstractPackageBasedHierarchicalContentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.io.ByteArrayInputStream;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentFactoryTest.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentFactoryTest.java
index 2c659bbad1f..7cbf22b1210 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentFactoryTest.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.io.File;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentTest.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentTest.java
index 5e014b81746..c1f8b0f51a7 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentTest.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.io.File;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/H5FolderCheckerTest.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/H5FolderCheckerTest.java
index 26850deec15..d4085d2f46d 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/H5FolderCheckerTest.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/H5FolderCheckerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import static org.testng.Assert.assertEquals;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/HDF5ContainerBasedHierarchicalContentNodeTest.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/HDF5ContainerBasedHierarchicalContentNodeTest.java
index 7a94bad3682..1686d9fe47f 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/HDF5ContainerBasedHierarchicalContentNodeTest.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/HDF5ContainerBasedHierarchicalContentNodeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.io.File;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/TarBasedHierarchicalContentTest.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/TarBasedHierarchicalContentTest.java
index c43bfd58ab4..7ba081c0a31 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/TarBasedHierarchicalContentTest.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/TarBasedHierarchicalContentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.io.File;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/VirtualHierarchicalContentTest.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/VirtualHierarchicalContentTest.java
index 9ea0421f472..709befb7470 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/VirtualHierarchicalContentTest.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/VirtualHierarchicalContentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.util.ArrayList;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/VirtualNodeMergingTest.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/VirtualNodeMergingTest.java
index 99ac91393c4..aa04f7595c1 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/VirtualNodeMergingTest.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/VirtualNodeMergingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.util.Arrays;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/VirtualNodeTest.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/VirtualNodeTest.java
index 1432a2be3ac..9cf6498e5ed 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/VirtualNodeTest.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/VirtualNodeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.io.File;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/ZipBasedHierarchicalContentTest.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/ZipBasedHierarchicalContentTest.java
index 1235202f931..2eb53fab019 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/ZipBasedHierarchicalContentTest.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/io/hierarchical_content/ZipBasedHierarchicalContentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.io.hierarchical_content;
 
 import java.io.File;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/logging/ServiceCallLogConfigurationTest.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/logging/ServiceCallLogConfigurationTest.java
index b5e2e2e6d7d..0020ccfa630 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/logging/ServiceCallLogConfigurationTest.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/logging/ServiceCallLogConfigurationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.logging;
 
 import java.io.IOException;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/spring/AbstractActionLogTest.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/spring/AbstractActionLogTest.java
index a72ae32fab3..9becac093d2 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/spring/AbstractActionLogTest.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/spring/AbstractActionLogTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.spring;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/spring/SpringTestCase.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/spring/SpringTestCase.java
index c3e23c2fe32..7d9fc802001 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/spring/SpringTestCase.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/spring/SpringTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.common.spring;
 
 import java.io.BufferedReader;
diff --git a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/spring/WaitAction.java b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/spring/WaitAction.java
index 6436d98b933..6c8698bfe88 100644
--- a/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/spring/WaitAction.java
+++ b/lib-openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/spring/WaitAction.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.common.spring;
 
 import org.hamcrest.Description;
-- 
GitLab