diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/BasicSession.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/BasicSession.java
index 33b983ada8ccc97708a51f7a35ac43a692f29021..16bff1181feccd2245ed1d6d4f2a406e1c983a74 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/BasicSession.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/BasicSession.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.authentication;
 
 import java.io.Serializable;
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/DefaultSessionManager.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/DefaultSessionManager.java
index 3bff08d201eede8e2fc4891e11b0d8d482c6ffc1..8005237900d7c0990311587f4150f0e878092e2d 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/DefaultSessionManager.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/DefaultSessionManager.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.authentication;
 
 import java.io.File;
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/DummyAuthenticationService.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/DummyAuthenticationService.java
index c0ff043340ae4d4aff9a9135680afc9993afa76c..2ee723d8a88bbf5a61fcddda3073bb8032e306fd 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/DummyAuthenticationService.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/DummyAuthenticationService.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.authentication;
 
 import java.util.List;
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/IAuthenticationService.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/IAuthenticationService.java
index 20b8a162b56c4ef419f2d0aa0f9123804209aa85..9752c778cad89ca5f168d0afd6141ba6bc41d940 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/IAuthenticationService.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/IAuthenticationService.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.authentication;
 
 import java.util.List;
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/ILogMessagePrefixGenerator.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/ILogMessagePrefixGenerator.java
index 1f9a02cf7a9ddbbfe451b7a2ee5644575cdb4ab2..58809692a20bbf290a4d7b01d3ec4a68bdfb013e 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/ILogMessagePrefixGenerator.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/ILogMessagePrefixGenerator.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.authentication;
 
 /**
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/IPrincipalProvider.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/IPrincipalProvider.java
index a9ea9ad5162e217bebc4cd68f04d22b00641755c..013334271821752cc8890d33e82023db5a944779 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/IPrincipalProvider.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/IPrincipalProvider.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.authentication;
 
 /**
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/ISessionActionListener.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/ISessionActionListener.java
index 9c8803b0a94e6c5c93b56d4346bbd2dd260decdb..8de0f6f0a3f7ead298260cead2757065c842f8bf 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/ISessionActionListener.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/ISessionActionListener.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.authentication;
 
 /**
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/ISessionFactory.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/ISessionFactory.java
index f82535ba86de81a7b8581b60a6668966da6e188c..2f7a898d95f0935df91c1f7b26468ea4993f567d 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/ISessionFactory.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/ISessionFactory.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.authentication;
 
 /**
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/ISessionManager.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/ISessionManager.java
index 05e60d85453411bf2455f4e492441f3eb2b5ae11..4480ff9a656253ee1c5302de59b626236196afa3 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/ISessionManager.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/ISessionManager.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.authentication;
 
 import java.util.List;
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/NullAuthenticationService.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/NullAuthenticationService.java
index de0b93d3cdad93b118ece17b9871f69edf0899e3..3d54eb0c08fd673fea98bdfec903b4a5f88934e9 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/NullAuthenticationService.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/NullAuthenticationService.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.authentication;
 
 import java.util.List;
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/Principal.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/Principal.java
index 34407cc0783212400a18e2123108177a4390d93a..e3e03cca280830de992801fdeabcde8dd9be8ae7 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/Principal.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/Principal.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.authentication;
 
 import java.io.Serializable;
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/SessionTokenHash.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/SessionTokenHash.java
index 20eafb94197e3e7b8910ddcc5716ac1feebb15eb..46acfcf57c35fc957bc4b77c702a94d2c152e8a5 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/SessionTokenHash.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/SessionTokenHash.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.authentication;
 
 import org.apache.commons.lang3.StringUtils;
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/crowd/CrowdAuthenticationService.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/crowd/CrowdAuthenticationService.java
index fb03c1aed023ee3e55941ec1d4f76479f74b5c0a..a0623834a47cd98b39afcec51b53fd6cc38bdd14 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/crowd/CrowdAuthenticationService.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/crowd/CrowdAuthenticationService.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.authentication.crowd;
 
 import java.io.IOException;
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/crowd/CrowdConfiguration.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/crowd/CrowdConfiguration.java
index e58f882000d6c2499cdaeded95408b172e1bda01..adc71ec10fc76670e017ed36be38e07cacb71479 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/crowd/CrowdConfiguration.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/crowd/CrowdConfiguration.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.authentication.crowd;
 
 import org.apache.commons.lang3.StringUtils;
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/crowd/CrowdSoapElements.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/crowd/CrowdSoapElements.java
index 7ed858422870ebf128809eaca42f544507d93d0a..abed7a13e1cf8d60966bd9749500bc789087e180 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/crowd/CrowdSoapElements.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/crowd/CrowdSoapElements.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.authentication.crowd;
 
 /**
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/crowd/IRequestExecutor.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/crowd/IRequestExecutor.java
index 69070005d2fa912733da14746de99d9ff964876e..bed99735a751af1c14e1f3a69473d7c2ad8e5f82 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/crowd/IRequestExecutor.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/crowd/IRequestExecutor.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.authentication.crowd;
 
 /**
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/crowd/SOAPAttributeContentHandler.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/crowd/SOAPAttributeContentHandler.java
index a14cb4854d8e9e57f3149ce599ab8f1711e315b8..5ff6640453e63ec25b70b88d1d983fc9b0b25503 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/crowd/SOAPAttributeContentHandler.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/crowd/SOAPAttributeContentHandler.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.authentication.crowd;
 
 import java.util.HashMap;
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/CachingAuthenticationConfiguration.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/CachingAuthenticationConfiguration.java
index cb79598e8c448fd7cfc78be48e57ae1157fc54cd..55b917b34946cec1a62191e3e5a9d65f2cb51b5d 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/CachingAuthenticationConfiguration.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/CachingAuthenticationConfiguration.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.authentication.file;
 
 import org.apache.commons.lang3.StringUtils;
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/CachingAuthenticationService.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/CachingAuthenticationService.java
index 01597e0dfbb7b8ac70d271015ff9f0b737e4f42d..d59e9f498f4f84b1d9aa6132eeee58f1f567e664 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/CachingAuthenticationService.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/CachingAuthenticationService.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.authentication.file;
 
 import java.io.File;
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/FileAuthenticationService.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/FileAuthenticationService.java
index 1b600f2f0ebf5f59a414047afb995e69a6658c5e..b5b74bd6244e11ae1317623a7adfdf371bbb56c2 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/FileAuthenticationService.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/FileAuthenticationService.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.authentication.file;
 
 import java.io.File;
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/FileBasedLineStore.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/FileBasedLineStore.java
index 5cf1ef134b93945792650a257a6d6056e4879c10..323a5a847309bf0cfca46467015a4bedb166d4a0 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/FileBasedLineStore.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/FileBasedLineStore.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.authentication.file;
 
 import java.io.File;
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/ILineStore.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/ILineStore.java
index 0743804f42157bbb2e516df50a157c9dcec7f271..02faa3dd97455ca3b2ae75dc47056c8f428ca0aa 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/ILineStore.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/ILineStore.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.authentication.file;
 
 import java.util.List;
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/IUserStore.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/IUserStore.java
index 6a24a6b3b5b3da0c2249ebbc89df09a154ba49ef..3d1be39d4135e2b84414a88064d18fec1bf4d7a4 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/IUserStore.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/IUserStore.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.authentication.file;
 
 import java.util.List;
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/LineBasedUserStore.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/LineBasedUserStore.java
index edc17052cb322983e818a34093bd90aa2bb978d0..9f2672215afb9d13a202d5a56dfff453f027de10 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/LineBasedUserStore.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/LineBasedUserStore.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.authentication.file;
 
 import java.util.ArrayList;
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/Parameters.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/Parameters.java
index b569b792c06787bea46405774331d932c5afc708..29d71538ae1f7d70715fc033a9e650918b9d77f5 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/Parameters.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/Parameters.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.authentication.file;
 
 import java.util.ArrayList;
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/PasswordEditorCommand.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/PasswordEditorCommand.java
index 2408fe37bdbdb07a9cb9bd9483f60d7ff2bcb229..76b5ae978ca2997cf2873bed73f6ada000715c14 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/PasswordEditorCommand.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/PasswordEditorCommand.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.authentication.file;
 
 import java.io.File;
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/UserCacheEntry.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/UserCacheEntry.java
index 938858e5d9b87afbe00263fa90f5d3f0be896d3d..f5cb12cb25e7a0a2b2c3ea7e0469ec38ec31fe29 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/UserCacheEntry.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/UserCacheEntry.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.authentication.file;
 
 import org.apache.commons.lang3.StringUtils;
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/UserEntry.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/UserEntry.java
index 79864ea9fdae9cd1efa16f8bdaf90a07901cfb07..5866ff85608e1b306c27014d7063cf1c3a8d97f4 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/UserEntry.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/UserEntry.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.authentication.file;
 
 import org.apache.commons.lang3.StringUtils;
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/UserEntryAuthenticationState.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/UserEntryAuthenticationState.java
index 881b411e0b0a31f8ecec8c6e08fa0d9fe3935938..9ec5814cd22e4c9a9d95165a93908d8829d6adff 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/UserEntryAuthenticationState.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/file/UserEntryAuthenticationState.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.authentication.file;
 
 /**
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/ldap/LDAPAuthenticationService.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/ldap/LDAPAuthenticationService.java
index 72bd4794eafa38a87446fa7fe533ae5558fd1a9c..d082301ebb9efeb48f50f44feeb2b9064770e648 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/ldap/LDAPAuthenticationService.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/ldap/LDAPAuthenticationService.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.authentication.ldap;
 
 import java.util.List;
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/ldap/LDAPDirectoryConfiguration.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/ldap/LDAPDirectoryConfiguration.java
index 36a40768492f81130c4481017c15447ecdd6a2ec..cc8002a4e2c353705744bfb740303048739398e5 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/ldap/LDAPDirectoryConfiguration.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/ldap/LDAPDirectoryConfiguration.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.authentication.ldap;
 
 import javax.naming.Context;
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/ldap/LDAPPrincipalQuery.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/ldap/LDAPPrincipalQuery.java
index 385df13ca2895a352af7e0908e0815387d1ff602..e7b689a5ab09aaae6e229c32104edfb70a45328f 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/ldap/LDAPPrincipalQuery.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/ldap/LDAPPrincipalQuery.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.authentication.ldap;
 
 import java.util.ArrayList;
diff --git a/lib-authentication/source/java/ch/systemsx/cisd/authentication/stacked/StackedAuthenticationService.java b/lib-authentication/source/java/ch/systemsx/cisd/authentication/stacked/StackedAuthenticationService.java
index 72af500f90e740507382b0f8fd790b10c497859c..13c383a255a7536745b61891060f3ff8e0457f63 100644
--- a/lib-authentication/source/java/ch/systemsx/cisd/authentication/stacked/StackedAuthenticationService.java
+++ b/lib-authentication/source/java/ch/systemsx/cisd/authentication/stacked/StackedAuthenticationService.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.authentication.stacked;
 
 import java.util.ArrayList;
diff --git a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/DefaultSessionManagerTest.java b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/DefaultSessionManagerTest.java
index be686ec4771772b63fce0da45a5c953a86fcf0a2..0caa214f331ec8dd9753fe84d7fcff7688d94dd9 100644
--- a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/DefaultSessionManagerTest.java
+++ b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/DefaultSessionManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.authentication;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/DependencyCheckingTest.java b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/DependencyCheckingTest.java
index cd7db3c1a29be635b87b954e087de2f6358efbcb..c3b623a164a53cd3c15d7bebcefe5908f361b625 100644
--- a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/DependencyCheckingTest.java
+++ b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/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.authentication;
 
 /**
diff --git a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/crowd/CrowdAuthenticationServiceTest.java b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/crowd/CrowdAuthenticationServiceTest.java
index bcc8c5fb1cbdcbabc456396eff788b84c873fb65..5e3b11679acef2cfca5111f5b0d75d3e74afdecf 100644
--- a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/crowd/CrowdAuthenticationServiceTest.java
+++ b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/crowd/CrowdAuthenticationServiceTest.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.authentication.crowd;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/crowd/RealCrowdAuthenticationTest.java b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/crowd/RealCrowdAuthenticationTest.java
index 6dab327c014f3e2aa07d7cc4347d1a2416ba59cf..f48b4f77b2d810da9fe17ec93cdd4502e5db507e 100644
--- a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/crowd/RealCrowdAuthenticationTest.java
+++ b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/crowd/RealCrowdAuthenticationTest.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.authentication.crowd;
 
 import static org.testng.AssertJUnit.*;
diff --git a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/CachingAuthenticationServiceInvalidLoginTests.java b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/CachingAuthenticationServiceInvalidLoginTests.java
index f75b691350dbd51cb749836e07ea6827d38ea708..1adb56d100e2b2fbee773a621a344b3fa22115cc 100644
--- a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/CachingAuthenticationServiceInvalidLoginTests.java
+++ b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/CachingAuthenticationServiceInvalidLoginTests.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.authentication.file;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/CachingAuthenticationServicePasswordChangingTests.java b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/CachingAuthenticationServicePasswordChangingTests.java
index b74934e7f10d511b5e27e27f16f7a74919f9b206..cec0035341394a514ea13c8809c3feb06d439fda 100644
--- a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/CachingAuthenticationServicePasswordChangingTests.java
+++ b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/CachingAuthenticationServicePasswordChangingTests.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.authentication.file;
 
 import static org.testng.AssertJUnit.*;
diff --git a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/CachingAuthenticationServiceSuccessTests.java b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/CachingAuthenticationServiceSuccessTests.java
index c30fed63440ebacb70b0e1f982de8741daef8208..ba3cc6b75e5d9747c0cf71508081bde2f3bb65fd 100644
--- a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/CachingAuthenticationServiceSuccessTests.java
+++ b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/CachingAuthenticationServiceSuccessTests.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.authentication.file;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/FileAuthenticationServiceTest.java b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/FileAuthenticationServiceTest.java
index d6fae38af96b1c1ecf66e1f84f5272f9f8d17816..0719f2b6802444f46ea1157773bbdf5ff510c6bb 100644
--- a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/FileAuthenticationServiceTest.java
+++ b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/FileAuthenticationServiceTest.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.authentication.file;
 
 import static org.testng.AssertJUnit.*;
diff --git a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/FileBasedLineStoreTest.java b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/FileBasedLineStoreTest.java
index 65e492cde267d6dfe37a8839e9d19b329d9ebd7e..33b40100b19651d0f0b94e0d7836e075eedeb01b 100644
--- a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/FileBasedLineStoreTest.java
+++ b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/FileBasedLineStoreTest.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.authentication.file;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/LineBasedUserStoreTest.java b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/LineBasedUserStoreTest.java
index be6267477fb29b355f7e0495cde8f085fda27b9f..3ca35c00874a4bc95cd38da11c161a1822a0e5c1 100644
--- a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/LineBasedUserStoreTest.java
+++ b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/LineBasedUserStoreTest.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.authentication.file;
 
 import static org.testng.AssertJUnit.*;
diff --git a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/PasswordEditorCommandTest.java b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/PasswordEditorCommandTest.java
index 9304512e8840253cb29165822bcaa74fd99ee276..92c3959ed89e7329443f509b89d4a604ea75e8f3 100644
--- a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/PasswordEditorCommandTest.java
+++ b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/PasswordEditorCommandTest.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.authentication.file;
 
 import static org.testng.Assert.assertEquals;
diff --git a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/UserEntryTest.java b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/UserEntryTest.java
index 0d1ab86aea1c7298e35c629c5afb578e919913d3..f06a9e594d0123fd300a8b96a64ecd064daa6767 100644
--- a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/UserEntryTest.java
+++ b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/UserEntryTest.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.authentication.file;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/ldap/LDAPDirectoryConfigurationTest.java b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/ldap/LDAPDirectoryConfigurationTest.java
index eb6fb42f845a32c9a2a4d8c70b0c81cd0da1e540..4a12239340fd04e4464b7884a964b6801f77edbb 100644
--- a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/ldap/LDAPDirectoryConfigurationTest.java
+++ b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/ldap/LDAPDirectoryConfigurationTest.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.authentication.ldap;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/ldap/RealLDAPAuthenticationTest.java b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/ldap/RealLDAPAuthenticationTest.java
index b7d9deb5b15fd33609e0c07269a24b84d23a99de..7a86c2b6a30362e6711d6d3cb6b34d71b55f120e 100644
--- a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/ldap/RealLDAPAuthenticationTest.java
+++ b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/ldap/RealLDAPAuthenticationTest.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.authentication.ldap;
 
 import org.testng.annotations.BeforeTest;
diff --git a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/stacked/StackedAuthenticationServiceTest.java b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/stacked/StackedAuthenticationServiceTest.java
index 79bd3088baa4971b738ca29924bf6f67522741a4..fbf85ebf9b44e40cb4ae5124fab6b5c638f594a0 100644
--- a/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/stacked/StackedAuthenticationServiceTest.java
+++ b/lib-authentication/sourceTest/java/ch/systemsx/cisd/authentication/stacked/StackedAuthenticationServiceTest.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.authentication.stacked;
 
 import static org.testng.AssertJUnit.*;