release 1.2.1

updating copyrights dates
Amartus · Jan 3, 2024 · a2e98b2 · a2e98b2
1 parent a945161
commit a2e98b2
Show file tree

Hide file tree

Showing 91 changed files with 372 additions and 164 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...build-standalone/src/main/java/com/mrv/yangtools/example/ioc/SwaggerGeneratorFactory.java b/...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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;