Adjust license with bacnet4j & update copyright year and license headers.

splatch · splatch · commit 16ef5986862a · 2018-12-28T16:16:20.000+01:00
diff --git a/api/src/main/java/org/code_house/bacnet4j/wrapper/api/BacNetClient.java b/api/src/main/java/org/code_house/bacnet4j/wrapper/api/BacNetClient.java
@@ -1,12 +1,12 @@
 /*
- * (C) Copyright 2016 Code-House and others.
+ * (C) Copyright 2018 Code-House and others.
  *
  * bacnet4j-wrapper is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- *     https://www.gnu.org/licenses/gpl-2.0.txt
+ *     https://www.gnu.org/licenses/gpl-3.0.txt
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/api/src/main/java/org/code_house/bacnet4j/wrapper/api/BacNetClientException.java b/api/src/main/java/org/code_house/bacnet4j/wrapper/api/BacNetClientException.java
@@ -1,12 +1,12 @@
 /*
- * (C) Copyright 2016 Code-House and others.
+ * (C) Copyright 2018 Code-House and others.
  *
  * bacnet4j-wrapper is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- *     https://www.gnu.org/licenses/gpl-2.0.txt
+ *     https://www.gnu.org/licenses/gpl-3.0.txt
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/api/src/main/java/org/code_house/bacnet4j/wrapper/api/BacNetToJavaConverter.java b/api/src/main/java/org/code_house/bacnet4j/wrapper/api/BacNetToJavaConverter.java
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2016 Code-House and others.
+ * (C) Copyright 2018 Code-House and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/org/code_house/bacnet4j/wrapper/api/BypassBacnetConverter.java b/api/src/main/java/org/code_house/bacnet4j/wrapper/api/BypassBacnetConverter.java
@@ -1,3 +1,22 @@
+/*
+ * (C) Copyright 2018 Code-House and others.
+ *
+ * bacnet4j-wrapper is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ *     https://www.gnu.org/licenses/gpl-3.0.txt
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Foobar; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 package org.code_house.bacnet4j.wrapper.api;
 
 import com.serotonin.bacnet4j.type.Encodable;
diff --git a/api/src/main/java/org/code_house/bacnet4j/wrapper/api/CollectingDiscoveryListener.java b/api/src/main/java/org/code_house/bacnet4j/wrapper/api/CollectingDiscoveryListener.java
@@ -1,12 +1,12 @@
 /*
- * (C) Copyright 2016 Code-House and others.
+ * (C) Copyright 2018 Code-House and others.
  *
  * bacnet4j-wrapper is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- *     https://www.gnu.org/licenses/gpl-2.0.txt
+ *     https://www.gnu.org/licenses/gpl-3.0.txt
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/api/src/main/java/org/code_house/bacnet4j/wrapper/api/Device.java b/api/src/main/java/org/code_house/bacnet4j/wrapper/api/Device.java
@@ -1,12 +1,12 @@
 /*
- * (C) Copyright 2016 Code-House and others.
+ * (C) Copyright 2018 Code-House and others.
  *
  * bacnet4j-wrapper is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- *     https://www.gnu.org/licenses/gpl-2.0.txt
+ *     https://www.gnu.org/licenses/gpl-3.0.txt
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/api/src/main/java/org/code_house/bacnet4j/wrapper/api/DeviceDiscoveryListener.java b/api/src/main/java/org/code_house/bacnet4j/wrapper/api/DeviceDiscoveryListener.java
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2016 Code-House and others.
+ * (C) Copyright 2018 Code-House and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/org/code_house/bacnet4j/wrapper/api/DiscoveryCallable.java b/api/src/main/java/org/code_house/bacnet4j/wrapper/api/DiscoveryCallable.java
@@ -1,12 +1,12 @@
 /*
- * (C) Copyright 2016 Code-House and others.
+ * (C) Copyright 2018 Code-House and others.
  *
  * bacnet4j-wrapper is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- *     https://www.gnu.org/licenses/gpl-2.0.txt
+ *     https://www.gnu.org/licenses/gpl-3.0.txt
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/api/src/main/java/org/code_house/bacnet4j/wrapper/api/JavaToBacNetConverter.java b/api/src/main/java/org/code_house/bacnet4j/wrapper/api/JavaToBacNetConverter.java
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2016 Code-House and others.
+ * (C) Copyright 2018 Code-House and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/org/code_house/bacnet4j/wrapper/api/NoopDiscoveryListener.java b/api/src/main/java/org/code_house/bacnet4j/wrapper/api/NoopDiscoveryListener.java
@@ -1,12 +1,12 @@
 /*
- * (C) Copyright 2016 Code-House and others.
+ * (C) Copyright 2018 Code-House and others.
  *
  * bacnet4j-wrapper is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- *     https://www.gnu.org/licenses/gpl-2.0.txt
+ *     https://www.gnu.org/licenses/gpl-3.0.txt
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/api/src/main/java/org/code_house/bacnet4j/wrapper/api/Property.java b/api/src/main/java/org/code_house/bacnet4j/wrapper/api/Property.java
@@ -1,12 +1,12 @@
 /*
- * (C) Copyright 2016 Code-House and others.
+ * (C) Copyright 2018 Code-House and others.
  *
  * bacnet4j-wrapper is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- *     https://www.gnu.org/licenses/gpl-2.0.txt
+ *     https://www.gnu.org/licenses/gpl-3.0.txt
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/api/src/main/java/org/code_house/bacnet4j/wrapper/api/Type.java b/api/src/main/java/org/code_house/bacnet4j/wrapper/api/Type.java
@@ -1,12 +1,12 @@
 /*
- * (C) Copyright 2016 Code-House and others.
+ * (C) Copyright 2018 Code-House and others.
  *
  * bacnet4j-wrapper is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- *     https://www.gnu.org/licenses/gpl-2.0.txt
+ *     https://www.gnu.org/licenses/gpl-3.0.txt
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/api/src/main/java/org/code_house/bacnet4j/wrapper/api/UnsupportedTypeException.java b/api/src/main/java/org/code_house/bacnet4j/wrapper/api/UnsupportedTypeException.java
@@ -1,12 +1,12 @@
 /*
- * (C) Copyright 2016 Code-House and others.
+ * (C) Copyright 2018 Code-House and others.
  *
  * bacnet4j-wrapper is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- *     https://www.gnu.org/licenses/gpl-2.0.txt
+ *     https://www.gnu.org/licenses/gpl-3.0.txt
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/api/src/main/java/org/code_house/bacnet4j/wrapper/api/util/ForwardingAdapter.java b/api/src/main/java/org/code_house/bacnet4j/wrapper/api/util/ForwardingAdapter.java
@@ -1,12 +1,12 @@
 /*
- * (C) Copyright 2016 Code-House and others.
+ * (C) Copyright 2018 Code-House and others.
  *
  * bacnet4j-wrapper is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- *     https://www.gnu.org/licenses/gpl-2.0.txt
+ *     https://www.gnu.org/licenses/gpl-3.0.txt
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/ip/src/main/java/org/code_house/bacnet4j/wrapper/ip/BacNetIpClient.java b/ip/src/main/java/org/code_house/bacnet4j/wrapper/ip/BacNetIpClient.java
@@ -1,12 +1,12 @@
 /*
- * (C) Copyright 2016 Code-House and others.
+ * (C) Copyright 2018 Code-House and others.
  *
  * bacnet4j-wrapper is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- *     https://www.gnu.org/licenses/gpl-2.0.txt
+ *     https://www.gnu.org/licenses/gpl-3.0.txt
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/ip/src/main/java/org/code_house/bacnet4j/wrapper/ip/DiscoveryMain.java b/ip/src/main/java/org/code_house/bacnet4j/wrapper/ip/DiscoveryMain.java
@@ -1,12 +1,12 @@
 /*
- * (C) Copyright 2016 Code-House and others.
+ * (C) Copyright 2018 Code-House and others.
  *
  * bacnet4j-wrapper is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- *     https://www.gnu.org/licenses/gpl-2.0.txt
+ *     https://www.gnu.org/licenses/gpl-3.0.txt
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/ip/src/main/java/org/code_house/bacnet4j/wrapper/ip/GeneratorMain.java b/ip/src/main/java/org/code_house/bacnet4j/wrapper/ip/GeneratorMain.java
@@ -6,7 +6,7 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- *     https://www.gnu.org/licenses/gpl-2.0.txt
+ *     https://www.gnu.org/licenses/gpl-3.0.txt
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/ip/src/main/java/org/code_house/bacnet4j/wrapper/ip/NetworkProgram.java b/ip/src/main/java/org/code_house/bacnet4j/wrapper/ip/NetworkProgram.java
@@ -6,7 +6,7 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- *     https://www.gnu.org/licenses/gpl-2.0.txt
+ *     https://www.gnu.org/licenses/gpl-3.0.txt
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/ip/src/main/java/org/code_house/bacnet4j/wrapper/ip/OpenHabConfigurationVisitor.java b/ip/src/main/java/org/code_house/bacnet4j/wrapper/ip/OpenHabConfigurationVisitor.java
@@ -6,7 +6,7 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- *     https://www.gnu.org/licenses/gpl-2.0.txt
+ *     https://www.gnu.org/licenses/gpl-3.0.txt
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/pom.xml b/pom.xml
@@ -28,8 +28,8 @@
 
     <licenses>
         <license>
-            <name>GNU General Public License, version 2</name>
-            <url>https://www.gnu.org/licenses/gpl-2.0.txt</url>
+            <name>GNU General Public License, version 3</name>
+            <url>https://www.gnu.org/licenses/gpl-3.0.txt</url>
             <comments>Due to bacnet4j dependency this library must be licensed under GNU GPL.</comments>
         </license>
     </licenses>

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`/*`
`2`		`- * (C) Copyright 2016 Code-House and others.`
	`2`	`+ * (C) Copyright 2018 Code-House and others.`
`3`	`3`	`*`
`4`	`4`	`* bacnet4j-wrapper is free software; you can redistribute it and/or modify`
`5`	`5`	`* it under the terms of the GNU General Public License as published by`
`6`	`6`	`* the Free Software Foundation; either version 2 of the License, or`
`7`	`7`	`* (at your option) any later version.`
`8`	`8`	`*`
`9`		`- * https://www.gnu.org/licenses/gpl-2.0.txt`
	`9`	`+ * https://www.gnu.org/licenses/gpl-3.0.txt`
`10`	`10`	`*`
`11`	`11`	`* This library is distributed in the hope that it will be useful,`
`12`	`12`	`* but WITHOUT ANY WARRANTY; without even the implied warranty of`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * (C) Copyright 2016 Code-House and others.`
	`2`	`+ * (C) Copyright 2018 Code-House and others.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* the Free Software Foundation; either version 2 of the License, or`
`7`	`7`	`* (at your option) any later version.`
`8`	`8`	`*`
`9`		`- * https://www.gnu.org/licenses/gpl-2.0.txt`
	`9`	`+ * https://www.gnu.org/licenses/gpl-3.0.txt`
`10`	`10`	`*`
`11`	`11`	`* This library is distributed in the hope that it will be useful,`
`12`	`12`	`* but WITHOUT ANY WARRANTY; without even the implied warranty of`