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 3212a823185043968f142a0818b2eff3fbe99097..0d5c427f09c00397bdd145d808944a4dab4588e2 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 39c542ef4c896a21fcecfd0914b9f2b15313b1d8..ed10e3d07609a5d6dd70067efa71853731a82bad 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 80f0f6ff013dfe1660f49d09ed549d5569fce8dc..d488ec90986ae1a4cc217b1f0eae01976769c5dd 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 8b78dfec9f498681e8ae843b501fab9652e53645..12752112536e30149f74285de8a59492c099854a 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 3d88e3e53bc21e4b710086e3ec69ff24be9bcc21..978a86cd96ebe981fc84956ca797c42a54c2a84d 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 fcd119c6bd181da12a53ee1401ff12571d8c5f13..1dff828a4704f0034911e8497e704a559849d9e2 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 eabeb13e63839f0257a176e622724f95f5b6b705..c8be1694c789b6d6cfbea2669c676780766b300d 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 88c3e676f80c0da3beaa5a4ce082e446c9af474f..64a0a9a08c63828000ccae6e4570e241620f00f2 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 0de7ca8db5ad91e9a580fc933f0f4b1693cc91ea..f540f57f3db446e0da28c4d151712fa05e53f5ae 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 e0b93c9544d27302cfd2061f38d89f0658668ae8..5be417ad25fea4a9ae200fe3c1c1725af1cbf16a 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 c6128405d6e751001a3b33f77f0a997ae92bb671..d69aee4c0ef8ccabba814d2c077d190f757cc3d8 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 c4fe993654302dcad5132c4e60338dafec78b2a0..0627f90ca0bce3a5a27756f64ee937b83e93ba08 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 cd81d83d385037298113eda9daf2908df2d44e7e..9617f4517c219c9915d21778b5c48553dfb5362d 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 f680160819c9ed5de5abd61e4bdcc80b0aca8e27..9042ecf601f17254b2eeaf271323923dc48e737e 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 fa6c2d3c244ebe922133f589623111aae22e7913..047776b6d78f5baf7e46f418bad19a6a0dc28bef 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 9fd9eccc1c6c7a678f4fd32597b179078182a3ba..8e97ca28699f6420983ed5f3af13d17159809485 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 fe00ce1c8e16b0d7c0258e02f613e85b62a6c42f..f046b434a8a1b34822b33134a2dd8eb83d7ab684 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 b27735b9dda230dd47b91299d230b3ebac4125b6..2896e2820b0ff48656cb6a7b84f869d05dfca8f2 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 8c689393bbcc3c02448a2930b9b59d2e58735651..323ed52f82dd457c653a013375aee039c185fc81 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 a0aefa58b805929eb1f0dcddaeda5bac144d4208..2fd266c617b203091c3eb48318d2d3e7a5cf5fb5 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 3d580d71a6321dc966fd4919ca4bd8e6ba05cd8b..6c3564bd089b15c8cc205146d5fd10adfa411318 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 e81d5dfc9754f1f245dc61419f4b1a78c7cf3455..9653612a7244eacc7383737eb6029af95ebb0a25 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 f84bacceb12a459fcfce14eb976a92c2d3ad92ad..b695f460fa6bf48656fd64ced07e07e0a44b2b02 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 e46bd4d2f25d43b279e68645bb40489f0018d634..6cd9570e5dfa56d94cc4288b10e6fdae7c8e282a 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 5f4aeedd8170e6426bb4dfc16994045b1d481f18..bad73ca67f44f5deb72f2a93a1e2b9f3e10d8f58 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 f561dcca0a38e6d6fffafe8a8b68c7c37e2731b5..f025defdaaa7391fb47818da3ae17a144a689708 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 4f743bb149ada9b7d59c2d189426767cdb179663..533eb20308661273b30e0c51379e128a2cd2ded0 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 6c23b0eda59f3a2a0ce17b100fb6761a32f712b0..c7652a0eb0948f7ea8d25ec93d21698503acd6b5 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 760af6b58976ca6f35dd313080b1cfcf9b68160f..3638a7a132ea3b5729205386c5b17befb5c5029c 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 dacbe4463ff6b0a23807c97948a52beb281fbded..0ae14dcd071583af0ee576b4f5cce4638f2615a3 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 dd0a5035f1fa2a943cd97da6840f2bf922a9e168..e8e2f6d19ff3e8e659511628e896158b13ca237b 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 7677c013d0e94d8adb7a40d56b997951a51a945b..a672107400ac60a607318c9a97e9f82806a2c45e 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 cd887cc83be6e919615685304e0ffee720b31e2c..33a5bc67ef405fb55a21f5321d2d06f5146e9d61 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 621d8cae1bafeee5da86750904784bb3e5baa175..083914fed1553341a616338b4cf37a82dd1d0f7f 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 97d9689b51f19d0246eeb7ecd956cf9b85d6efab..489d39a24c9d24eaf2f828b563ab5433f27723f3 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 645848a400deaaa657ca4fac2a5ee88bee770f8b..27a176097b2a743c319de8dd3e7a498927c91a3e 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 21f8db9eefadd3188a8a00e56e25039ba60e9f15..1763988923972dda1a520d06dfc6ebf05e9c270a 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 758f7b87802ca3bbba430bedc99eb0bb99bb91f2..956e5ecd8979655a7b5afe315dde311c11be5cfa 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 133e34eca1d528e885e3f85dbe2da94a51c19f99..cfa81d23b2078535731e70b35df712973f4ef67d 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 3e6450ebe0675db3d8652ab9fe01af608c44b121..4eb4346493f2343a1d0f88671afd3994b41c4415 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 7db8f82dce477d74c579b64a0963919fb3c69ac2..0290358298db083a2b8856c937b76acf6167506e 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 305c9d703ef615d9c67a42d0449b5fb414e7721c..238711580112d1925aa7c57275bc30c601a070a7 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 a46b350a08f8f4849df1fc2468bfdbae7438faa6..f8b287e9e460646b39b6cd1f8f7bace40e677f23 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 40f0b828b2c235d6ee6364973bfa8164a9573a04..0b49bb343faa65e6df15b3b7727df644314a87f1 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 16ff495883583071a0b3b020eca5cb3b90388eeb..406abc6328b433d7e715ddd2a47e849a543bf4d2 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 4338164168f739dd5a68e29b4e51002264e00cd9..7a5032c008a60cbc30a7cee6517957c5e4a64f75 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 cdf4fef0ab0d6308a674d3b2685ef6ca03d674c1..d2e97a2a4a5a3ebdfb579de14484da9ae2d30c9d 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 8d52357a05b987c926d27dd99c800cb37d015411..07ac0346c7c3a2b44bb99b275f428dad0c811676 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 fb481d23a2e19a9ee279040192e706ef9c49fde4..814860af7df672a1eba513b5f8188ac0fd1fe596 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 7d375d385cd1334ddd1e13d4cb7d8c1134487ffd..b7a68e29cf3be5dec4077e3bdb8a4189267dfbc9 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 6004ad03008cc0c9772f7d7bdab6862c6a9dc0dd..6cb75eb94ca6b6f5a6af130987a1ff6484949281 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 ac46512fd4335fee883f1666b4d6cb1eafb4b5c8..9271c039a38b357e6ab4ccafad8c69b3ee9ee224 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 48a13d69bb70fc3603d85ec4df3937d09ca0e339..edf2c8e325e5f3930c7d287b26805238f6f0e2c0 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 87388aa888235468bc81c49a5531928d0cf4d51b..8201ed93bebdf1e8d9896ac82f520bb6fe3341d6 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 5b684746ea94de04486596da84358c3122571152..c6241bc3f1343ae6b62641958af11ef749da9904 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 971f75fc59d51b52ccf6547ca6fe95d0453b9e2f..5ee65a8a91b1b9817acda2a4a4d58bb41562518f 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 7cc20c1f3a5ef0284cea082341d6e0c4cc22a817..bba7fc0234c7ffdd799031a56e1608b0ae4a6cfe 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 a29276536e1c1446c2c0cfc318538bf629c18b25..b515e96eb6c4c02dd67880e23a7622c77767442a 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 421d062e09f05ab11ebc7855f3905a1f791a88e2..77407ba4c442fc0146ff1adc706d7ecf1e21fcf5 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 eb15074047fd136602b9300a6c943a236d19536e..e3185d1709a183fc00cb2e99c54f9ac6b032bab2 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 7eee6fadfa7437b6fe71d0f0236788b9d50c526e..79c8a74a9b85db2ee8b8af0b312f437a55e08382 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 6c21c069f1c68de084942a2aa762579c263cf22c..9cb876cdb9a69e82efdd25d6ac61c749e74b42fe 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 37810533cd64beb7626f5dc35b17c543747682a6..c4daba4ea0b5922bcaa1b02e2ee356d53da47740 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 5988d40cd44e0f6b9fd9ffb71bf13d736368b284..4217a013346aeef03989c62e22c692ffa03c868b 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 a76724fc180b429e9de134c383e8c7c6690824ca..5cb47ecb9b057b8bbadbf50f2a8101e4213ad821 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 2ec4da4d81358b87df68e6a6787c56350bd78d8c..5808e68958cd1c0ace80daa22ef297224125e40a 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 3ac293832275996f4e6099ec80fce3deabbaabf6..499d0ace78565b3c0020f69e8222a9487c199dc6 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 177d88b085f4be9a4b0a44979a36ac178406ab9a..707e0656a8c9d86e9e98e4995c438bb958f0048d 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 8560b487ceb9294a4f3468474e31587685aa0f30..e4c5381d587ed42ba20a7a3104426c69bbcbf900 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 dfa631da1c7eca5feead046e189d06e2cffb3a40..27a73813130e0bffaeb877bb81d565d6e4d37d90 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 ffc77e30b5f9b532f0eefc4a6c76e1ce8b941d24..5bb30f6810d9846aaa81290d266ae846cd50ebbf 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 15aa38fa6a5a3ca40fc4c6081871356bc1ded1b9..9fab482d930b3d05b053cb9001d1a2e61e407224 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 b24edb1396b058b186b4d6ef8877700cc66b5fc8..f5decfdf236708c10b3d2c6be049b86f80569f94 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 3cd76bf1fdf36bc9fb1b453bd91d58870ceb23be..1684549ecb72385c3674ff2a6e739a6da9a3c48b 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 ffff349a1624a2b4dbdd0bd8f013d1b3906ff61f..f5aab7a5351d94706b58f8ab8d6a73ebc65e55c6 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 9ac0f80c95c4c9782bc8aeeaef3855492247a2db..f75b7d582016a7aa8d71a19aa831a7322523c515 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 d92470039eeba120221d694465cf709749790068..8f47938a695a232d2555f2e288af2bf1b0f76d70 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 450eef4aa9a4c0ba116d4084bcb9331258af33fc..fe794e19a07464b3f612ed3b655ce63ce520f15a 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 46be17fcb5c5c9570e0c9daac764feb83ede4d37..f52319bfed0c94e1ec82388418c0421a2f4c00c5 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 107c5765b00d5b6b24a30e10bd75f230483cf266..b9133c47c97b2d52923f50c53eec6c2094493376 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 677a6ba55bd05a3fccf7ee2d2e38b05c95a1a4ca..18ee473e17778830496b5570c4cfc95565d9f621 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 8eda113eec16a20ddc2c6265a586c34890f61cf0..dbaeb061d608323d8b54b633c51f550050891d9d 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 124da9b90025a42e1a0f9df446a1848e83bfbaf0..78c4d700c4e85d7cf25bbc993c988154109fd719 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 9d95a4626cf0c7102b141ec454becb519b92a882..730b4e68115aef9b00b959a12dfb18bf81ddb84c 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 d8f954d02885052045655381df250557d0a33f60..ba62981c96cc5942721fa3868e0c74df1d4fcc75 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 9ef9796e404c96bcd6e7da076bd94264294b9f36..91cf3f71eb5608c410c06e2eeeeb52c878bd2266 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 48d0c055c95a6440854b97884498f457ff2fe42c..8c272100967d10d4817c427e734e6e235c5a5a01 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 9a8b73daf363b0407bccdc782b69f0d99448f59a..a279414d3b20e6f7b432f394e21a0c93e565cca8 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 a9fa04b2d780332264029f89b6d2373020fa944f..b411cba46d01649df90a923f92788e660bdf5444 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 cb37068b4d32069490c460b06e910bd31e86b033..44f8ea957307780db97b187bb4e06781ad3d98ae 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 351fa1a5cfdb1f9a90f61e24ff5754c6c05a9755..b597bf060d0b27d57a63c1ed301a1e58cda2af8f 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 6defe39004a113aa2a4efad4a246cd8866983c5e..ec165821b80d07d8e0ce4793068eb76b33c95513 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 0fac4060bb68d1f54891b6aabe1c627659103fd8..e6f091b5da3cacfca831f9a6051f677ac80d485c 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 2733b709af4f47bb3c2c6a5b68af0c50a9adce2f..16367ca94f9818da3fdaad16dccdaa8e07145ebe 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 62d8a6eda690af653f743317aba3e2b3bd3343a4..2d8aed523ccdc52b8b6b148a72530d2c9f72e9b0 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 012cdb1ee31b65fd26f46ff782d3016bca2bc6dc..6358d936cce319c4f67442af7442c97089589c38 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 0e4c7def5ccf731b2d3f8f2d00794cd3260b5864..778b0d254c03ac4eef721e514168c289c0c4bd07 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 907f71657d1d4302699424e7f100f40246456f7b..f01203d51e6ca768570413e7a4c196231d975fde 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 b1eee07f60e03ba9b0adc81eab0de36075243acb..852f1dca0b75271524adf276aff0339cce762d9b 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 9c6f933cfebb77890740ed138942ad84fc50b42f..f91c33e9ff724068e27d8dbfa883de28ec7a0e0f 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 06bde6a405a21de4b24b373100e369c91bd6ac4d..90dd1797b7490fb92a8b73d3e22eb38cfb6e91e9 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 f48ae5b31dfccf5c69fc66788e2d7e3e3de2b5e4..0ea252af6db446501cd0cfbc24855b786a3d080b 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 2efa7ed497ec92d7f7b9560459abc7ee2a7fd0ae..e306fbeca18dcd47b8d6d8ed7fcdafad1e39f51a 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 d4d8fd3b066c8ae810057b1e8e564f17bb5decdf..f809f828c2cf8689ae43370b3a1e2aec63cd3efa 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 a8013c6db73c0ff6fb257edd8463cb838d9a5169..c2b6f275c2cab413dd2a76dc5f5ff0e6bfaa1294 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 f999b143e24b47f3eca01e64187496730bed94a4..1a944bc114e418e0402bb9e723a8de0282cd5746 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 f21dc0e503d5d356c1b97509f7e8323de2a0e2a3..33e592be96d12278e0d4ea6dd655921996b3616a 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 5b0c35ce504b56eb0a579a64b6d43d2cc839d19c..ae2e7b33a0507d0d63f4e33b20c823d535c1d687 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 a503016d6171e89af3b7eea29dfc9a5fb586fa0c..c5bad40ab5daa0ae1b0099ede90e7cd9d5b9db21 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 2304edc7619891711c117accba8eb09c18374d83..154cf8387e6440571270769fa1c067183a6ea730 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 33cf3d232a796ffb55c2eae1c69effac4d11e712..14f74102f1396436f483054ab4355ce81ab280d3 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 a9ef7f7163c669cc50795d4cea2486f0fc3596fc..6e8ffaf5957406619c114a2152cdfe70ab77f6fd 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 395c73f57f1e1a3206d49f462497f7cc78634f07..59b094bb994053ba74732ca6e987d50dfec92c6e 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 479198fde2d35678b6deb701568fe1f964c71a67..5d76eb1e500ca04f9a534233c65f96ce1260c784 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 f4f4be8b1efa5ba6182ce1df4167cb553ad90e2f..4b6d4c681a9c2b32524c2cd6593300e71c1fa090 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 7814aeaa69dc504903b9a15372a38b52777e8cd0..4b43e6fb00df7117d354b4480830ee3ece82af5f 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 373fcca2bb13b25408ae137630a2b854fd6fb21a..4c55d2b951c2cf24b16d1102528e8dd5de8746f5 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 60c2ac370b4b7e5c5014d47945216d011b6b8747..e8a4cda60c24ee2b1134cb8d7e1993a6b19c8598 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 03b5df3a211b6c513fa81ba725f24cfc34d22b62..908104ac20a7cf98ec0b394d0de7d9e6055747a4 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 f106b26289c153bd5410fa34a47bce0e8b4ca699..1dd8616855ce437a1b90b12a710e860a0c2829fc 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 2766a8f0506da9a4d00d3420cb3d01268ceeb681..59e5b1514913277cb30ee31ffa01761e3da4a45f 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 2555550e6364fb5d8efd81b04f062b8878acab4d..b73c8292eaf05a72a00931c1e7e39fec5ce234d6 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 9919a9db5a42725d8d56eb9dae8ede0766c27b94..6865df8882692f153d5597e509d9a5d24f88c4ad 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 9d72caff873f6e7f037e5a6983aee8f878347335..b7eb2244e3f1d28c19e079afd6e0ba3a573ed0df 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 1048c3cde4c7a7e6012a3b51df7e8a00b4435ffa..0fa850df4208e3b03b9544df6968f721e2563fea 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 983b35f0848101608f32d218c94e9cb9c8410dee..5faa1a55f7b3a4469c2abb45f58c517b2a0af8ca 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 9bf82beb8e1ad034d97a8984d13c2e2bc7daf91e..6ce62a9c84cb8e248da1950a038690a6a7664a70 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 c42dbc864bc2c223028c4f800074ea828180f4d5..6c6e9b9cbbaac100ca16691863c851ace34cd1b5 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 0f8aa6cc103ea87f1b40be0ff2cb8937a20319c9..1f9b2ee72ee175ac691f28104c3e9466733ea6fe 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 9f54bf082f930099c9c53cfcc33b74381a8f8364..c8e7e5f380692a2e143144300055ff38d259bac1 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 a4ff86c5da7cc3a43b9a2a4f34978c2b9b928ea5..77959e66325ee113024fde4edc72d73cd1c60101 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 b5df879d1c94b877fb25dfd34d7e190447143ca9..0ad3126c2c7c8f1625f281d6c1207a59e127d205 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 c75d04b492f413ce31e6fbf70122c0383bc5d266..3c709694fdbe8f46c348cf1d4ea44d0883ef6e63 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 3f0860b7d1bea61b9d49a307f8a3304cd92f3e45..1f6e6b6b3a81a879562040221adcc6d1701158d9 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 a915a66b44b2cb2897cccc86307356bdb5497ea4..cd5b5c0764b12fac613c8724d1b60d5595a49cc0 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 ed27cb272c98a597f1f2bc789f1147448174285e..36c1e69cb7512e3d5a13db0fecaaa7af620c0237 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 38515187179d3d2d5be5c8a346eaf96891f93f14..71113fbbf70fe94201c6e90a43db55e7be103a0d 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 984bc91bb78f0caee498d6e50c0cd81713b5025d..715a8811151ddd61de081c1c69b5177f99c935e0 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 81df74e89e54ffe0a2b4c2c7ed29a7a03ac483ce..50bb34130d6c0b31d95bd039caac5c23cbd4e35f 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 57248a68ad170681ecbad0ade4955f00514e8312..e6e6de713bf88430a394d41a5dba48853364d8f6 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 205f87713714e4135b8672adee91355f64f4b61e..bdf0c639f99e6e184f7ec7b0abd427cc5df3531d 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 926798c966236863774db917950fccfa0da10704..30556e6d5852418fbd44323290096d9dee2ca4ec 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 583ae6515162cd07bbf8e34a4d04b2f356470534..afacfdf574de35a980c37941f84689cee62f1fbf 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 498d3d7e0177e0825b06af2606fec945b49d8921..039f46ead6d8abc74dac6c2f65325408e8138ac7 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 f6bdf3db791be2b693fc83fde3dceb66d67a8cfe..f66630ebbf059b6182a4e13cc87c3234ee44d4ea 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 0faccc159437e68c4595af990c450cb9746e14a0..05f78a153db45d0ac0d3deeb504c19f8e70db79c 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 0ac4b10828db9cecf91b766646b727d594f1dfa7..c2c9aaf3b233ea376cf1e1940937c12d585d9f3b 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 36b1cf0c12759f456118da097db151aa2ed98350..ccd626c718c79a1bde0b4e7f4caf0c5dc9d42add 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 e376e38cb306175f3ea1fc362eb5c39e81a13498..293e3f4f1d9d43ae2cdb5fa40bde403eb19579b6 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 3e69b5e043dc926a6f4d3433fd449883be36e4e1..ac04d8b7628e6dc9d8b48d7251229be0c49463d5 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 b4b35e02514b82e3d842d7ec247e79b9a4b4c8a3..5d6fc516e6e1b35c7fd1dce8d489e741295cb4af 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 8850e1d77d623f57ff4e5736181017ed011acaf7..009c92a075cf0b538c1f4aa8143eb376cad377cc 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 22e0b787cb648cb4f95246a4c8f4d5fa1a05db19..c18b3cef701b7018202bfc9a0ea58803ba6f6129 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 6bcd36813d30212e36a364037af6e875bf6a8a41..2cd308bd7cc64d783e4d3d055023c105eac94f7b 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 15ae729e751e7701a197e0e8c8c1e3075a2f9170..34c5f7d28f8443e1ebbeb8ed2dd064c1c85096f2 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 30923933a41b7eabd46696b288ba48340a5688af..4439d7db754a8ba7047a745cd4ca31c4d30e377c 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 ce540973aedae703c799628e94388b297991febc..928886ce9c824e4022c0080fd5bff0fb13c78156 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 ab01454ac13a49d1c08d39bd3222408dca25e57f..f42323b051fec0897bd4f05a3f4bd6e0c9ed09a9 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 f9f73decf9990e1ca22e775f1e3cc0ca793868e7..8b67fef4da56877badf49f3bd3679743af319e94 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 d239a5137efab9d9ce9844d0f499586f37b62fc4..eec5650acee23b19190332b6981d2a7a931b389e 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 a219271ab27011f9ed0e3633c7e559fdbaeae722..66e75a41647c252bb5420fe656c98cc11a698a49 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 66a6b1898ce7baf1b533d8c02075d6b9e532d31a..e7e9dddf43fe0fb165cfb9981e606e1e43c6d1b1 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 58b67ac6392d8850a26573009c66c2ae0e8b033e..caa40199a14f4815e9a75d0b01110e55125ac6b5 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 e18482c6b2c4325d53c88acd8e0d60da60cf5daa..24f7d49caf392d44b6bafcfebaedc523ce97650a 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 33d4378f270027a9a4aff2c39a35549266b329fd..249e3b3bfb097b668727e4fd57ebd6f005a2e753 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 eb5670e84c1f7c22393242537e3d6290951b22dc..469a5be66efbf88597c044620c34c01f6621d480 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 2c659bbad1f3c26dbcc3af3f1f3a5656f4cdebbc..7cbf22b121037cf669d7916f8395ae8f1b8a7f47 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 5e014b81746c2fb2d7256c32564389034166a35b..c1f8b0f51a75d27ee724a4dfd79cec65412d587d 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 26850deec1591efa37a5802e1819f2c9eb65cfb9..d4085d2f46d2e138d28567d7455c2c1710e9681e 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 7a94bad368225c215b086612bc1360bb5c71e78c..1686d9fe47f0f4385a5ccef05ec106a68395d33d 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 c43bfd58ab407475677421b49b47ece38629d8ae..7ba081c0a31cce8ae6f55af7386262f2fe7a8b8c 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 9ea0421f472e464d65dac0af70d6a0f30e3d2ee2..709befb7470d25d8e89c0f3a99a16c068f273e2f 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 99ac91393c4f8f75198f674a4927ed8cf8e81bb2..aa04f7595c1a6a3f5ea15849a21b2fbf61f25452 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 1432a2be3ac0e48c9ea2d69112f848b0a42b9689..9cf6498e5eddf50dab198a0b926c6d85adeebd88 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 1235202f931b782f09d1bb88e61eb6b2457784d7..2eb53fab0194492ad3e2df1dd203f6d64b0aab76 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 b5e2e2e6d7d849d83cb52c52497751e9b75548b6..0020ccfa63070230d215353abee333debc841dcc 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 a72ae32fab39b304860bbc05ee10b6d341d054a8..9becac093d22f0561261224a64a65bd6815bfa71 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 c3e23c2fe3275b8a921178e1b79978f720e7dd8a..7d9fc802001a68a943c0aec4f3d82055002d9747 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 6436d98b933255419fe9cc54b947ffb9c0ccfc0b..6c8698bfe8859dfd20409e5eba0417344b62dd58 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;