diff --git a/cli/pom.xml b/cli/pom.xml
index 476652f8..183575ea 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~   Copyright (c) 2024 Amartus. All rights reserved.
+  ~  This program and the accompanying materials are made available under the
+  ~  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+  ~  and is available at http://www.eclipse.org/legal/epl-v10.html
+  ~
+  ~    Contributors:
+  ~       Bartosz Michalik <bartosz.michalik@amartus.com>
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>yangtools</artifactId>
         <groupId>com.mrv.yangtools</groupId>
-       <version>2.1.0-SNAPSHOT</version>
+       <version>2.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/cli/src/main/java/com/mrv/yangtools/codegen/main/Main.java b/cli/src/main/java/com/mrv/yangtools/codegen/main/Main.java
index c60d823c..b0cb20ec 100644
--- a/cli/src/main/java/com/mrv/yangtools/codegen/main/Main.java
+++ b/cli/src/main/java/com/mrv/yangtools/codegen/main/Main.java
@@ -1,3 +1,12 @@
+/*
+ *   Copyright (c) 2024 Amartus. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+ *    Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
+ */
+
 package com.mrv.yangtools.codegen.main;
 
 import com.mrv.yangtools.codegen.SwaggerGenerator;
diff --git a/cli/src/main/resources/logback.xml b/cli/src/main/resources/logback.xml
index 248fa8ec..e94d8513 100644
--- a/cli/src/main/resources/logback.xml
+++ b/cli/src/main/resources/logback.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+  ~   Copyright (c) 2016-2024  MRV Communications, Inc. All rights reserved.
   ~  This program and the accompanying materials are made available under the
   ~  terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/cli/src/test/java/com/mrv/yangtools/codegen/main/Issue57.java b/cli/src/test/java/com/mrv/yangtools/codegen/main/Issue57.java
index 9c467329..210e8af5 100644
--- a/cli/src/test/java/com/mrv/yangtools/codegen/main/Issue57.java
+++ b/cli/src/test/java/com/mrv/yangtools/codegen/main/Issue57.java
@@ -1,3 +1,12 @@
+/*
+ *   Copyright (c) 2024 Amartus. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+ *    Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
+ */
+
 package com.mrv.yangtools.codegen.main;
 
 import io.swagger.models.Swagger;
diff --git a/cli/src/test/java/com/mrv/yangtools/codegen/main/Utils.java b/cli/src/test/java/com/mrv/yangtools/codegen/main/Utils.java
index 7f19d65d..1653df2c 100644
--- a/cli/src/test/java/com/mrv/yangtools/codegen/main/Utils.java
+++ b/cli/src/test/java/com/mrv/yangtools/codegen/main/Utils.java
@@ -1,3 +1,13 @@
+/*
+ *  Copyright (c) 2024 Amartus. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+
+ *  Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
+ */
+
 package com.mrv.yangtools.codegen.main;
 
 import io.swagger.models.Swagger;
diff --git a/common/pom.xml b/common/pom.xml
index 91e86ed4..0aae2403 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+  ~   Copyright (c) 2016-2024  MRV Communications, Inc. All rights reserved.
   ~  This program and the accompanying materials are made available under the
   ~  terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~  and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -16,7 +16,7 @@
     <parent>
         <artifactId>yangtools</artifactId>
         <groupId>com.mrv.yangtools</groupId>
-       <version>2.1.0-SNAPSHOT</version>
+       <version>2.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/common/src/main/java/com/mrv/yangtools/common/BindingMapping.java b/common/src/main/java/com/mrv/yangtools/common/BindingMapping.java
index eb7bf505..c3195326 100644
--- a/common/src/main/java/com/mrv/yangtools/common/BindingMapping.java
+++ b/common/src/main/java/com/mrv/yangtools/common/BindingMapping.java
@@ -1,3 +1,12 @@
+/*
+ *   Copyright (c) 2024 Amartus. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+ *    Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
+ */
+
 package com.mrv.yangtools.common;
 
 // Source code recreated from a .class file by IntelliJ IDEA
diff --git a/common/src/main/java/com/mrv/yangtools/common/ContextHelper.java b/common/src/main/java/com/mrv/yangtools/common/ContextHelper.java
index 1fc6139a..c371e9a6 100644
--- a/common/src/main/java/com/mrv/yangtools/common/ContextHelper.java
+++ b/common/src/main/java/com/mrv/yangtools/common/ContextHelper.java
@@ -1,12 +1,11 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024 Amartus. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *      Christopher Murch <cmurch@mrv.com>
- *      Bartosz Michalik <bartosz.michalik@amartus.com>
+ *    Contributors:
+ *       Christopher Murch <cmurch@mrv.com>
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
  */
 
 package com.mrv.yangtools.common;
diff --git a/common/src/main/java/com/mrv/yangtools/common/SchemaBuilder.java b/common/src/main/java/com/mrv/yangtools/common/SchemaBuilder.java
index 916c97c1..9dfcc5d8 100644
--- a/common/src/main/java/com/mrv/yangtools/common/SchemaBuilder.java
+++ b/common/src/main/java/com/mrv/yangtools/common/SchemaBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/common/src/main/java/com/mrv/yangtools/common/SwaggerUtils.java b/common/src/main/java/com/mrv/yangtools/common/SwaggerUtils.java
index eae9d81e..5afc70da 100644
--- a/common/src/main/java/com/mrv/yangtools/common/SwaggerUtils.java
+++ b/common/src/main/java/com/mrv/yangtools/common/SwaggerUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Amartus. All rights reserved.
+ *   Copyright (c) 2018-2024 Amartus. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/common/src/main/java/com/mrv/yangtools/common/Tuple.java b/common/src/main/java/com/mrv/yangtools/common/Tuple.java
index c94ead65..a7303e40 100644
--- a/common/src/main/java/com/mrv/yangtools/common/Tuple.java
+++ b/common/src/main/java/com/mrv/yangtools/common/Tuple.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/examples/build-standalone/pom.xml b/examples/build-standalone/pom.xml
index 9b590d3c..7f9af2c9 100644
--- a/examples/build-standalone/pom.xml
+++ b/examples/build-standalone/pom.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+  ~   Copyright (c) 2016-2024  MRV Communications, Inc. All rights reserved.
   ~  This program and the accompanying materials are made available under the
   ~  terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~  and is available at http://www.eclipse.org/legal/epl-v10.html
-  ~
-  ~  Contributors:
-  ~      Christopher Murch <cmurch@mrv.com>
-  ~      Bartosz Michalik <bartosz.michalik@amartus.com>
+  ~    Contributors:
+  ~       Christopher Murch <cmurch@mrv.com>
+  ~       Bartosz Michalik <bartosz.michalik@amartus.com>
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -16,7 +15,7 @@
     <parent>
         <artifactId>examples</artifactId>
         <groupId>com.mrv.yangtools</groupId>
-       <version>2.1.0-SNAPSHOT</version>
+       <version>2.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/examples/build-standalone/src/main/java/com/mrv/yangtools/example/CodeGenerator.java b/examples/build-standalone/src/main/java/com/mrv/yangtools/example/CodeGenerator.java
index cec9d019..b70d5d72 100644
--- a/examples/build-standalone/src/main/java/com/mrv/yangtools/example/CodeGenerator.java
+++ b/examples/build-standalone/src/main/java/com/mrv/yangtools/example/CodeGenerator.java
@@ -1,12 +1,11 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024  MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *      Christopher Murch <cmurch@mrv.com>
- *      Bartosz Michalik <bartosz.michalik@amartus.com>
+ *    Contributors:
+ *       Christopher Murch <cmurch@mrv.com>
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
  */
 
 package com.mrv.yangtools.example;
diff --git a/examples/build-standalone/src/main/java/com/mrv/yangtools/example/GeneratorHelper.java b/examples/build-standalone/src/main/java/com/mrv/yangtools/example/GeneratorHelper.java
index 2fc19684..a84243ce 100644
--- a/examples/build-standalone/src/main/java/com/mrv/yangtools/example/GeneratorHelper.java
+++ b/examples/build-standalone/src/main/java/com/mrv/yangtools/example/GeneratorHelper.java
@@ -1,12 +1,11 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *      Christopher Murch <cmurch@mrv.com>
- *      Bartosz Michalik <bartosz.michalik@amartus.com>
+ *    Contributors:
+ *       Christopher Murch <cmurch@mrv.com>
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
  */
 
 package com.mrv.yangtools.example;
diff --git a/examples/build-standalone/src/main/java/com/mrv/yangtools/example/YamlGenerator.java b/examples/build-standalone/src/main/java/com/mrv/yangtools/example/YamlGenerator.java
index 00ee4e3a..3403e547 100644
--- a/examples/build-standalone/src/main/java/com/mrv/yangtools/example/YamlGenerator.java
+++ b/examples/build-standalone/src/main/java/com/mrv/yangtools/example/YamlGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/examples/build-standalone/src/main/java/com/mrv/yangtools/example/ioc/GeneratorInjector.java b/examples/build-standalone/src/main/java/com/mrv/yangtools/example/ioc/GeneratorInjector.java
index c239289e..ec193c87 100644
--- a/examples/build-standalone/src/main/java/com/mrv/yangtools/example/ioc/GeneratorInjector.java
+++ b/examples/build-standalone/src/main/java/com/mrv/yangtools/example/ioc/GeneratorInjector.java
@@ -1,11 +1,10 @@
 /*
- * Copyright (c) 2018 Amartus. All rights reserved.
+ *   Copyright (c) 2018-2024 Amartus. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *      Damian Mrozowicz <damian.mrozowicz@amartus.com>
+ *    Contributors:
+ *       Damian Mrozowicz <damian.mrozowicz@amartus.com>
  */
 package com.mrv.yangtools.example.ioc;
 
diff --git a/examples/build-standalone/src/main/java/com/mrv/yangtools/example/ioc/SwaggerGeneratorFactory.java b/examples/build-standalone/src/main/java/com/mrv/yangtools/example/ioc/SwaggerGeneratorFactory.java
index 1fd42a4c..00951fe0 100644
--- a/examples/build-standalone/src/main/java/com/mrv/yangtools/example/ioc/SwaggerGeneratorFactory.java
+++ b/examples/build-standalone/src/main/java/com/mrv/yangtools/example/ioc/SwaggerGeneratorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Amartus. All rights reserved.
+ *   Copyright (c) 2018-2024 Amartus. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/examples/build-standalone/src/main/resources/logback.xml b/examples/build-standalone/src/main/resources/logback.xml
index 77d774f3..0eb74733 100644
--- a/examples/build-standalone/src/main/resources/logback.xml
+++ b/examples/build-standalone/src/main/resources/logback.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+  ~   Copyright (c) 2016-2024  MRV Communications, Inc. All rights reserved.
   ~  This program and the accompanying materials are made available under the
   ~  terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/examples/pom.xml b/examples/pom.xml
index 55751420..fce7da06 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+  ~   Copyright (c) 2016-2024  MRV Communications, Inc. All rights reserved.
   ~  This program and the accompanying materials are made available under the
   ~  terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~  and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -16,7 +16,7 @@
     <parent>
         <artifactId>yangtools</artifactId>
         <groupId>com.mrv.yangtools</groupId>
-       <version>2.1.0-SNAPSHOT</version>
+       <version>2.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
diff --git a/pom.xml b/pom.xml
index 65a96c15..700fcbde 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+  ~   Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
   ~  This program and the accompanying materials are made available under the
   ~  terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~  and is available at http://www.eclipse.org/legal/epl-v10.html
-  ~
-  ~  Contributors:
-  ~      Christopher Murch <cmurch@mrv.com>
-  ~      Bartosz Michalik <bartosz.michalik@amartus.com>
+  ~    Contributors:
+  ~       Christopher Murch <cmurch@mrv.com>
+  ~       Bartosz Michalik <bartosz.michalik@amartus.com>
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -17,7 +16,7 @@
 
     <groupId>com.mrv.yangtools</groupId>
     <artifactId>yangtools</artifactId>
-   <version>2.1.0-SNAPSHOT</version>
+   <version>2.1.0</version>
     <modules>
         <module>swagger-generator</module>
         <module>common</module>
diff --git a/swagger-codegen-jaxrs/pom.xml b/swagger-codegen-jaxrs/pom.xml
index 93d948a2..14fc0f09 100644
--- a/swagger-codegen-jaxrs/pom.xml
+++ b/swagger-codegen-jaxrs/pom.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+  ~   Copyright (c) 2016-2024  MRV Communications, Inc. All rights reserved.
   ~  This program and the accompanying materials are made available under the
   ~  terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~  and is available at http://www.eclipse.org/legal/epl-v10.html
-  ~
-  ~  Contributors:
-  ~      Christopher Murch <cmurch@mrv.com>
-  ~      Bartosz Michalik <bartosz.michalik@amartus.com>
+  ~    Contributors:
+  ~       Christopher Murch <cmurch@mrv.com>
+  ~       Bartosz Michalik <bartosz.michalik@amartus.com>
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -16,7 +15,7 @@
     <parent>
         <artifactId>yangtools</artifactId>
         <groupId>com.mrv.yangtools</groupId>
-       <version>2.1.0-SNAPSHOT</version>
+       <version>2.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/swagger-codegen-jaxrs/src/main/java/com/mrv/yangutils/codegen/JerseyServerCodegen.java b/swagger-codegen-jaxrs/src/main/java/com/mrv/yangutils/codegen/JerseyServerCodegen.java
index 122b2a2e..183ad3d2 100644
--- a/swagger-codegen-jaxrs/src/main/java/com/mrv/yangutils/codegen/JerseyServerCodegen.java
+++ b/swagger-codegen-jaxrs/src/main/java/com/mrv/yangutils/codegen/JerseyServerCodegen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024  MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-codegen-jaxrs/src/main/resources/JavaJaxRS/libraries/mrv/pom.mustache b/swagger-codegen-jaxrs/src/main/resources/JavaJaxRS/libraries/mrv/pom.mustache
index 59125638..b4d1249c 100644
--- a/swagger-codegen-jaxrs/src/main/resources/JavaJaxRS/libraries/mrv/pom.mustache
+++ b/swagger-codegen-jaxrs/src/main/resources/JavaJaxRS/libraries/mrv/pom.mustache
@@ -11,7 +11,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.0</version>
       </plugin>
       <plugin>
         <artifactId>maven-failsafe-plugin</artifactId>
diff --git a/swagger-generator/pom.xml b/swagger-generator/pom.xml
index 6c5263d0..78906e57 100644
--- a/swagger-generator/pom.xml
+++ b/swagger-generator/pom.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+  ~   Copyright (c) 2016-2024.  MRV Communications, Inc. All rights reserved.
   ~  This program and the accompanying materials are made available under the
   ~  terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~  and is available at http://www.eclipse.org/legal/epl-v10.html
-  ~
-  ~  Contributors:
-  ~      Christopher Murch <cmurch@mrv.com>
-  ~      Bartosz Michalik <bartosz.michalik@amartus.com>
+  ~    Contributors:
+  ~       Christopher Murch <cmurch@mrv.com>
+  ~       Bartosz Michalik <bartosz.michalik@amartus.com>
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -16,7 +15,7 @@
     <parent>
         <artifactId>yangtools</artifactId>
         <groupId>com.mrv.yangtools</groupId>
-       <version>2.1.0-SNAPSHOT</version>
+       <version>2.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -72,12 +71,6 @@
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
         </dependency>
-      <dependency>
-        <groupId>org.mozilla</groupId>
-        <artifactId>rhino</artifactId>
-        <version>1.7.7.2</version>
-        <scope>compile</scope>
-      </dependency>
 
     </dependencies>
 
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/DataObjectBuilder.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/DataObjectBuilder.java
index 3e9a309d..10f14601 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/DataObjectBuilder.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/DataObjectBuilder.java
@@ -1,12 +1,11 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024  MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *      Christopher Murch <cmurch@mrv.com>
- *      Bartosz Michalik <bartosz.michalik@amartus.com>
+ *    Contributors:
+ *       Christopher Murch <cmurch@mrv.com>
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
  */
 
 package com.mrv.yangtools.codegen;
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/DataObjectRepo.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/DataObjectRepo.java
index dc4225f3..3b8bd062 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/DataObjectRepo.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/DataObjectRepo.java
@@ -1,12 +1,11 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *      Christopher Murch <cmurch@mrv.com>
- *      Bartosz Michalik <bartosz.michalik@amartus.com>
+ *    Contributors:
+ *       Christopher Murch <cmurch@mrv.com>
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
  */
 
 package com.mrv.yangtools.codegen;
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/PathHandler.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/PathHandler.java
index b596b7de..37a4216b 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/PathHandler.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/PathHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/PathHandlerBuilder.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/PathHandlerBuilder.java
index fcb6b007..9cf3b37a 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/PathHandlerBuilder.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/PathHandlerBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/PathPrinter.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/PathPrinter.java
index 14b63d5c..b167eb5f 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/PathPrinter.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/PathPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/PathSegment.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/PathSegment.java
index 9fc96039..10beb5b4 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/PathSegment.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/PathSegment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/SwaggerGenerator.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/SwaggerGenerator.java
index 4399356b..a9704f69 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/SwaggerGenerator.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/SwaggerGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2022 Amartus. All rights reserved.
+ * Copyright (c) 2018-2024 Amartus. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/TagGenerator.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/TagGenerator.java
index fd42cac1..e1e92320 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/TagGenerator.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/TagGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/AbstractDataObjectBuilder.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/AbstractDataObjectBuilder.java
index c267e29d..2f81d559 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/AbstractDataObjectBuilder.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/AbstractDataObjectBuilder.java
@@ -1,12 +1,11 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024.  MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *      Christopher Murch <cmurch@mrv.com>
- *      Bartosz Michalik <bartosz.michalik@amartus.com>
+ *    Contributors:
+ *       Christopher Murch <cmurch@mrv.com>
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
  */
 
 package com.mrv.yangtools.codegen.impl;
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/AnnotatingTypeConverter.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/AnnotatingTypeConverter.java
index 7035935e..b802e6a3 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/AnnotatingTypeConverter.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/AnnotatingTypeConverter.java
@@ -1,12 +1,11 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024.  MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *      Christopher Murch <cmurch@mrv.com>
- *      Bartosz Michalik <bartosz.michalik@amartus.com>
+ *    Contributors:
+ *       Christopher Murch <cmurch@mrv.com>
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
  */
 
 package com.mrv.yangtools.codegen.impl;
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/DataNodeHelper.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/DataNodeHelper.java
index e5a6f161..32cf0387 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/DataNodeHelper.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/DataNodeHelper.java
@@ -1,12 +1,11 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024  MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *      Christopher Murch <cmurch@mrv.com>
- *      Bartosz Michalik <bartosz.michalik@amartus.com>
+ *    Contributors:
+ *       Christopher Murch <cmurch@mrv.com>
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
  */
 
 package com.mrv.yangtools.codegen.impl;
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/DataNodeIterable.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/DataNodeIterable.java
index 9522ae4a..535cfd88 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/DataNodeIterable.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/DataNodeIterable.java
@@ -1,12 +1,11 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *      Christopher Murch <cmurch@mrv.com>
- *      Bartosz Michalik <bartosz.michalik@amartus.com>
+ *    Contributors:
+ *       Christopher Murch <cmurch@mrv.com>
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
  */
 
 package com.mrv.yangtools.codegen.impl;
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/GroupingHierarchyHandler.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/GroupingHierarchyHandler.java
index 8facaa29..9d1a46ed 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/GroupingHierarchyHandler.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/GroupingHierarchyHandler.java
@@ -1,12 +1,11 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024  MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *      Christopher Murch <cmurch@mrv.com>
- *      Bartosz Michalik <bartosz.michalik@amartus.com>
+ *    Contributors:
+ *       Christopher Murch <cmurch@mrv.com>
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
  */
 
 package com.mrv.yangtools.codegen.impl;
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/ModelUtils.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/ModelUtils.java
index 98020e8e..831f244f 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/ModelUtils.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/ModelUtils.java
@@ -1,3 +1,12 @@
+/*
+ *   Copyright (c) 2024 Amartus. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+ *    Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
+ */
+
 package com.mrv.yangtools.codegen.impl;
 
 import io.swagger.models.Model;
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/ModuleUtils.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/ModuleUtils.java
index 7973bce8..5cc94bf7 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/ModuleUtils.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/ModuleUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024  MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/OptimizingDataObjectBuilder.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/OptimizingDataObjectBuilder.java
index c10b113f..d9adf267 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/OptimizingDataObjectBuilder.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/OptimizingDataObjectBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/TypeConverter.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/TypeConverter.java
index 0c7872f4..71b3988c 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/TypeConverter.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/TypeConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *  Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/UnpackingDataObjectsBuilder.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/UnpackingDataObjectsBuilder.java
index 9e701079..8d081b40 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/UnpackingDataObjectsBuilder.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/UnpackingDataObjectsBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/AbstractPathHandler.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/AbstractPathHandler.java
index f5ff8cca..8597abb3 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/AbstractPathHandler.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/AbstractPathHandler.java
@@ -1,3 +1,13 @@
+/*
+ *   Copyright (c) 2024.  MRV Communications, Inc. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+ *    Contributors:
+ *       Christopher Murch <cmurch@mrv.com>
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
+ */
+
 package com.mrv.yangtools.codegen.impl.path;
 
 import com.mrv.yangtools.codegen.*;
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/AbstractPathHandlerBuilder.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/AbstractPathHandlerBuilder.java
index fc599ce7..0627e5c5 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/AbstractPathHandlerBuilder.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/AbstractPathHandlerBuilder.java
@@ -1,11 +1,10 @@
 /*
- * Copyright (c) 2018 Amartus. All rights reserved.
+ *  Copyright (c) 2018-2024 Amartus. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *      Bartosz Michalik <bartosz.michalik@amartus.com>
+ *    Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
  */
 package com.mrv.yangtools.codegen.impl.path;
 
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/DeleteOperationGenerator.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/DeleteOperationGenerator.java
index 246227e6..1406b86f 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/DeleteOperationGenerator.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/DeleteOperationGenerator.java
@@ -1,12 +1,11 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *      Christopher Murch <cmurch@mrv.com>
- *      Bartosz Michalik <bartosz.michalik@amartus.com>
+ *    Contributors:
+ *       Christopher Murch <cmurch@mrv.com>
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
  */
 
 package com.mrv.yangtools.codegen.impl.path;
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/GetOperationGenerator.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/GetOperationGenerator.java
index d1d12d0c..2b401661 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/GetOperationGenerator.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/GetOperationGenerator.java
@@ -1,12 +1,11 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024  MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *      Christopher Murch <cmurch@mrv.com>
- *      Bartosz Michalik <bartosz.michalik@amartus.com>
+ *    Contributors:
+ *       Christopher Murch <cmurch@mrv.com>
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
  */
 
 package com.mrv.yangtools.codegen.impl.path;
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/OperationGenerator.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/OperationGenerator.java
index cad706bf..e43f94e9 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/OperationGenerator.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/OperationGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024  MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/PatchOperationGenerator.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/PatchOperationGenerator.java
index 1f3408d2..1330bf37 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/PatchOperationGenerator.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/PatchOperationGenerator.java
@@ -1,3 +1,12 @@
+/*
+ *   Copyright (c) 2024 Amartus. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+ *    Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
+ */
+
 package com.mrv.yangtools.codegen.impl.path;
 
 import com.mrv.yangtools.codegen.DataObjectRepo;
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/PostOperationGenerator.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/PostOperationGenerator.java
index 2f2135d2..42f79db0 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/PostOperationGenerator.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/PostOperationGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024  MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/PutOperationGenerator.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/PutOperationGenerator.java
index d1bedf42..f9a0743a 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/PutOperationGenerator.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/PutOperationGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *  Copyright (c) 2016-2024  MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/SegmentTagGenerator.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/SegmentTagGenerator.java
index d18b2c90..5d0effb2 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/SegmentTagGenerator.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/SegmentTagGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/odl/ODLPathHandler.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/odl/ODLPathHandler.java
index 7d32811d..3f20b67d 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/odl/ODLPathHandler.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/odl/ODLPathHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Amartus. All rights reserved.
+ *   Copyright (c) 2018-2024 Amartus. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/odl/ODLPathHandlerBuilder.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/odl/ODLPathHandlerBuilder.java
index b3eb292b..3fd2cb02 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/odl/ODLPathHandlerBuilder.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/odl/ODLPathHandlerBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Amartus. All rights reserved.
+ *   Copyright (c) 2018-2024 Amartus. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/odl/ODLRestconfPathPrinter.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/odl/ODLRestconfPathPrinter.java
index 2a1ee12a..609d991a 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/odl/ODLRestconfPathPrinter.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/odl/ODLRestconfPathPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Amartus. All rights reserved.
+ *   Copyright (c) 2018-2024 Amartus. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/rfc8040/PathHandler.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/rfc8040/PathHandler.java
index 878b67be..d057d3ff 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/rfc8040/PathHandler.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/rfc8040/PathHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/rfc8040/PathHandlerBuilder.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/rfc8040/PathHandlerBuilder.java
index 69994bc9..a950ede8 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/rfc8040/PathHandlerBuilder.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/rfc8040/PathHandlerBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/rfc8040/RestconfPathPrinter.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/rfc8040/RestconfPathPrinter.java
index ee1f2a1b..8e8f8b13 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/rfc8040/RestconfPathPrinter.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/path/rfc8040/RestconfPathPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/AddSecurityDefinitions.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/AddSecurityDefinitions.java
index a0eaa012..68de4216 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/AddSecurityDefinitions.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/AddSecurityDefinitions.java
@@ -1,11 +1,10 @@
 /*
- * Copyright (c) 2018 Amartus. All rights reserved.
+ *   Copyright (c) 2018-2024 Amartus. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *      Bartosz Michalik <bartosz.michalik@amartus.com>
+ *    Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
  */
 package com.mrv.yangtools.codegen.impl.postprocessor;
 
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/CollapseTypes.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/CollapseTypes.java
index 5448a2e7..dd28691a 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/CollapseTypes.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/CollapseTypes.java
@@ -1,11 +1,10 @@
 /*
- * Copyright (c) 2018 Amartus. All rights reserved.
+ *   Copyright (c) 2018-2024 Amartus. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *      Bartosz Michalik <bartosz.michalik@amartus.com>
+ *    Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
  */
 package com.mrv.yangtools.codegen.impl.postprocessor;
 
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/PathPrunner.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/PathPrunner.java
index 974f99db..9cd7a83c 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/PathPrunner.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/PathPrunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Amartus. All rights reserved.
+ *  Copyright (c) 2018-2024 Amartus. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/PayloadWrapperProcessor.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/PayloadWrapperProcessor.java
index 94df8d5c..afeb02eb 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/PayloadWrapperProcessor.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/PayloadWrapperProcessor.java
@@ -1,3 +1,12 @@
+/*
+ *   Copyright (c) 2024 Amartus. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+ *    Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
+ */
+
 package com.mrv.yangtools.codegen.impl.postprocessor;
 
 import io.swagger.models.*;
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/RemoveUnusedDefinitions.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/RemoveUnusedDefinitions.java
index 16e3c84e..2efd91e0 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/RemoveUnusedDefinitions.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/RemoveUnusedDefinitions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Amartus. All rights reserved.
+ *   Copyright (c) 2018-2024 Amartus All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/ReplaceEmptyWithParent.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/ReplaceEmptyWithParent.java
index d04bbc3d..7637bc1b 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/ReplaceEmptyWithParent.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/ReplaceEmptyWithParent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Amartus. All rights reserved.
+ * Copyright (c) 2018-2024 Amartus. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/Rfc4080PayloadWrapper.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/Rfc4080PayloadWrapper.java
index a2531ec7..4e347ed0 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/Rfc4080PayloadWrapper.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/Rfc4080PayloadWrapper.java
@@ -1,3 +1,13 @@
+/*
+ *  Copyright (c) 2024 Amartus. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+
+ *  Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
+ */
+
 package com.mrv.yangtools.codegen.impl.postprocessor;
 
 /**
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/ShortenName.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/ShortenName.java
index d27a6966..64754070 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/ShortenName.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/ShortenName.java
@@ -1,3 +1,13 @@
+/*
+ *  Copyright (c) 2024 Amartus. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+
+ *  Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
+ */
+
 package com.mrv.yangtools.codegen.impl.postprocessor;
 
 import com.mrv.yangtools.common.Tuple;
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/SingleParentInheritenceModel.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/SingleParentInheritenceModel.java
index 672f63a2..d6fd24b2 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/SingleParentInheritenceModel.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/SingleParentInheritenceModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Amartus. All rights reserved.
+ *   Copyright (c) 2018-2024 Amartus. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/SortComplexModels.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/SortComplexModels.java
index 319dc3cf..950323a8 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/SortComplexModels.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/SortComplexModels.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Amartus. All rights reserved.
+ *  Copyright (c) 2018-2024 Amartus. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/SwaggerRefHelper.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/SwaggerRefHelper.java
index a95be9ab..3b898460 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/SwaggerRefHelper.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/SwaggerRefHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Amartus. All rights reserved.
+ *  Copyright (c) 2018-2024 Amartus. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/TypeNode.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/TypeNode.java
index f37fb499..a872c29e 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/TypeNode.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/TypeNode.java
@@ -1,3 +1,13 @@
+/*
+ *  Copyright (c) 2024 Amartus. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+
+ *  Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
+ */
+
 package com.mrv.yangtools.codegen.impl.postprocessor;
 
 import java.util.HashSet;
diff --git a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/TypesUsageTreeBuilder.java b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/TypesUsageTreeBuilder.java
index e3860701..c3e1b486 100644
--- a/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/TypesUsageTreeBuilder.java
+++ b/swagger-generator/src/main/java/com/mrv/yangtools/codegen/impl/postprocessor/TypesUsageTreeBuilder.java
@@ -1,3 +1,13 @@
+/*
+ *  Copyright (c) 2024 Amartus. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+
+ *  Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
+ */
+
 package com.mrv.yangtools.codegen.impl.postprocessor;
 
 import org.slf4j.Logger;
diff --git a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/AbstractItTest.java b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/AbstractItTest.java
index 050ef57a..36de82c2 100644
--- a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/AbstractItTest.java
+++ b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/AbstractItTest.java
@@ -1,3 +1,12 @@
+/*
+ *   Copyright (c) 2024 Amartus. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+ *    Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
+ */
+
 package com.mrv.yangtools.codegen;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/DataObjectsBuilderTest.java b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/DataObjectsBuilderTest.java
index 3099b9c0..2c6bfda8 100644
--- a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/DataObjectsBuilderTest.java
+++ b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/DataObjectsBuilderTest.java
@@ -1,12 +1,11 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *      Christopher Murch <cmurch@mrv.com>
- *      Bartosz Michalik <bartosz.michalik@amartus.com>
+ *    Contributors:
+ *       Christopher Murch <cmurch@mrv.com>
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
  */
 
 package com.mrv.yangtools.codegen;
diff --git a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/SwaggerGeneratorAugmentationsTestIt.java b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/SwaggerGeneratorAugmentationsTestIt.java
index 4bf9499b..a425bfff 100644
--- a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/SwaggerGeneratorAugmentationsTestIt.java
+++ b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/SwaggerGeneratorAugmentationsTestIt.java
@@ -1,3 +1,13 @@
+/*
+ *  Copyright (c) 2024 Amartus. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+
+ *     Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
+ */
+
 package com.mrv.yangtools.codegen;
 
 
diff --git a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/SwaggerGeneratorTestIt.java b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/SwaggerGeneratorTestIt.java
index c2c8d6f8..f7a6444c 100644
--- a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/SwaggerGeneratorTestIt.java
+++ b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/SwaggerGeneratorTestIt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *  Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/SwaggerGeneratorWithOdlPathHandlerTest.java b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/SwaggerGeneratorWithOdlPathHandlerTest.java
index 9c34dba3..99f7cc50 100644
--- a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/SwaggerGeneratorWithOdlPathHandlerTest.java
+++ b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/SwaggerGeneratorWithOdlPathHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Amartus. All rights reserved.
+ *   Copyright (c) 2018-2024 Amartus. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/path/odl/ODLRestconfPathPrinterTest.java b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/path/odl/ODLRestconfPathPrinterTest.java
index b12f0537..d89eb31e 100644
--- a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/path/odl/ODLRestconfPathPrinterTest.java
+++ b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/path/odl/ODLRestconfPathPrinterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Amartus. All rights reserved.
+ *   Copyright (c) 2018-2024 Amartus. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/path/rfc8040/RestconfPathPrinterTest.java b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/path/rfc8040/RestconfPathPrinterTest.java
index 1e8246a0..81c94d6e 100644
--- a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/path/rfc8040/RestconfPathPrinterTest.java
+++ b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/path/rfc8040/RestconfPathPrinterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/AbstractWithSwagger.java b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/AbstractWithSwagger.java
index f7aee50b..6b4a7aef 100644
--- a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/AbstractWithSwagger.java
+++ b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/AbstractWithSwagger.java
@@ -1,3 +1,12 @@
+/*
+ *   Copyright (c) 2024 Amartus. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+ *    Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
+ */
+
 package com.mrv.yangtools.codegen.impl.postprocessor;
 
 import io.swagger.models.*;
diff --git a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/CollapseTypesTest.java b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/CollapseTypesTest.java
index 7fb95b00..5457f788 100644
--- a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/CollapseTypesTest.java
+++ b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/CollapseTypesTest.java
@@ -1,3 +1,12 @@
+/*
+ *   Copyright (c) 2024 Amartus. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+ *    Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
+ */
+
 package com.mrv.yangtools.codegen.impl.postprocessor;
 
 import com.mrv.yangtools.codegen.SwaggerGenerator;
diff --git a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/PathPrunnerTest.java b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/PathPrunnerTest.java
index e54fe36b..12a88870 100644
--- a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/PathPrunnerTest.java
+++ b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/PathPrunnerTest.java
@@ -1,3 +1,12 @@
+/*
+ *  Copyright (c) 2024 Amartus. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+ *    Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
+ */
+
 package com.mrv.yangtools.codegen.impl.postprocessor;
 
 import org.hamcrest.core.Every;
diff --git a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/RemoveUnusedDefinitionsTest.java b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/RemoveUnusedDefinitionsTest.java
index 99565f57..a928d42d 100644
--- a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/RemoveUnusedDefinitionsTest.java
+++ b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/RemoveUnusedDefinitionsTest.java
@@ -1,3 +1,12 @@
+/*
+ *   Copyright (c) 2024 Amartus. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+ *    Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
+ */
+
 package com.mrv.yangtools.codegen.impl.postprocessor;
 
 import io.swagger.models.Path;
diff --git a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/ReplaceEmptyWithParentTest.java b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/ReplaceEmptyWithParentTest.java
index 93750072..84c73703 100644
--- a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/ReplaceEmptyWithParentTest.java
+++ b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/ReplaceEmptyWithParentTest.java
@@ -1,3 +1,12 @@
+/*
+ *  Copyright (c) 2024 Amartus All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+ *    Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
+ */
+
 package com.mrv.yangtools.codegen.impl.postprocessor;
 
 import static org.junit.Assert.assertTrue;
diff --git a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/Rfc4080PayloadWrapperTest.java b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/Rfc4080PayloadWrapperTest.java
index 2889e54e..9123f80a 100644
--- a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/Rfc4080PayloadWrapperTest.java
+++ b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/Rfc4080PayloadWrapperTest.java
@@ -1,3 +1,13 @@
+/*
+ *  Copyright (c) 2024 Amartus. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+
+ *  Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
+ */
+
 package com.mrv.yangtools.codegen.impl.postprocessor;
 
 import org.junit.Test;
diff --git a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/SwaggerRefHelperTest.java b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/SwaggerRefHelperTest.java
index 755b920a..14517063 100644
--- a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/SwaggerRefHelperTest.java
+++ b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/impl/postprocessor/SwaggerRefHelperTest.java
@@ -1,3 +1,12 @@
+/*
+ *   Copyright (c) 2024 Amartus. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+ *    Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
+ */
+
 package com.mrv.yangtools.codegen.impl.postprocessor;
 
 import io.swagger.models.Path;
diff --git a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/issues/Issue57.java b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/issues/Issue57.java
index 486980fb..72c27624 100644
--- a/swagger-generator/src/test/java/com/mrv/yangtools/codegen/issues/Issue57.java
+++ b/swagger-generator/src/test/java/com/mrv/yangtools/codegen/issues/Issue57.java
@@ -1,3 +1,12 @@
+/*
+ *   Copyright (c) 2024 Amartus. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+ *    Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
+ */
+
 package com.mrv.yangtools.codegen.issues;
 
 import com.mrv.yangtools.codegen.AbstractItTest;
diff --git a/swagger-generator/src/test/java/com/mrv/yangtools/test/utils/MockNodeBuilder.java b/swagger-generator/src/test/java/com/mrv/yangtools/test/utils/MockNodeBuilder.java
index 97c07b73..61701e31 100644
--- a/swagger-generator/src/test/java/com/mrv/yangtools/test/utils/MockNodeBuilder.java
+++ b/swagger-generator/src/test/java/com/mrv/yangtools/test/utils/MockNodeBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/test/java/com/mrv/yangtools/test/utils/SwaggerHelper.java b/swagger-generator/src/test/java/com/mrv/yangtools/test/utils/SwaggerHelper.java
index d45f80e3..efa502c9 100644
--- a/swagger-generator/src/test/java/com/mrv/yangtools/test/utils/SwaggerHelper.java
+++ b/swagger-generator/src/test/java/com/mrv/yangtools/test/utils/SwaggerHelper.java
@@ -1,3 +1,13 @@
+/*
+ *  Copyright (c) 2024 Amartus. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ *     Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
+ */
+
 package com.mrv.yangtools.test.utils;
 
 import io.swagger.models.ArrayModel;
diff --git a/swagger-generator/src/test/java/com/mrv/yangtools/test/utils/SwaggerReader.java b/swagger-generator/src/test/java/com/mrv/yangtools/test/utils/SwaggerReader.java
index 6714b121..d4a50424 100644
--- a/swagger-generator/src/test/java/com/mrv/yangtools/test/utils/SwaggerReader.java
+++ b/swagger-generator/src/test/java/com/mrv/yangtools/test/utils/SwaggerReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
diff --git a/swagger-generator/src/test/java/com/mrv/yangtools/test/utils/SwaggerWritter.java b/swagger-generator/src/test/java/com/mrv/yangtools/test/utils/SwaggerWritter.java
index ccc893a6..feec2621 100644
--- a/swagger-generator/src/test/java/com/mrv/yangtools/test/utils/SwaggerWritter.java
+++ b/swagger-generator/src/test/java/com/mrv/yangtools/test/utils/SwaggerWritter.java
@@ -1,3 +1,13 @@
+/*
+ *  Copyright (c) 2024 Amartus. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+
+ *  Contributors:
+ *       Bartosz Michalik <bartosz.michalik@amartus.com>
+ */
+
 package com.mrv.yangtools.test.utils;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/swagger-maven-plugin/pom.xml b/swagger-maven-plugin/pom.xml
index 3b3b2059..8983e982 100644
--- a/swagger-maven-plugin/pom.xml
+++ b/swagger-maven-plugin/pom.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+  ~   Copyright (c) 2016-2024 MRV Communications, Inc. All rights reserved.
   ~  This program and the accompanying materials are made available under the
   ~  terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~  and is available at http://www.eclipse.org/legal/epl-v10.html
-  ~
-  ~  Contributors:
-  ~      Christopher Murch <cmurch@mrv.com>
-  ~      Bartosz Michalik <bartosz.michalik@amartus.com>
+  ~    Contributors:
+  ~       Christopher Murch <cmurch@mrv.com>
+  ~       Bartosz Michalik <bartosz.michalik@amartus.com>
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -16,7 +15,7 @@
     <parent>
         <artifactId>yangtools</artifactId>
         <groupId>com.mrv.yangtools</groupId>
-       <version>2.1.0-SNAPSHOT</version>
+       <version>2.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/swagger-maven-plugin/src/main/java/com/mrv/yangtools/maven/gen/swagger/MavenSwaggerGenerator.java b/swagger-maven-plugin/src/main/java/com/mrv/yangtools/maven/gen/swagger/MavenSwaggerGenerator.java
index c124cdd9..6318b1c5 100644
--- a/swagger-maven-plugin/src/main/java/com/mrv/yangtools/maven/gen/swagger/MavenSwaggerGenerator.java
+++ b/swagger-maven-plugin/src/main/java/com/mrv/yangtools/maven/gen/swagger/MavenSwaggerGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 MRV Communications, Inc. All rights reserved.
+ *   Copyright (c) 2016-2024  MRV Communications, Inc. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  *  and is available at http://www.eclipse.org/legal/epl-v10.html