Merge pull request #11876 from digitalstain/3.2-licensing

Licensing and copyright changes for 3.2
neo4j · May 29, 2018 · 7e067be · 7e067be
2 parents a42640b + 0dfb346
commit 7e067be
Show file tree

Hide file tree

Showing 8,648 changed files with 55,927 additions and 36,042 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing to the Neo4j Ecosystem
 
-At [Neo Technology](https://neo4j.com/), we develop our software in the open at GitHub.
+At [Neo4j](https://neo4j.com/), we develop our software in the open at GitHub.
 This provides transparency for you, our users, and allows you to fork the software to make your own additions and enhancements.
 We also provide areas specifically for community contributions, in particular the [neo4j-contrib](https://github.com/neo4j-contrib) space.
 

diff --git a/README.asciidoc b/README.asciidoc
@@ -74,4 +74,4 @@ to start Neo4j.
 
 == Licensing ==
 
-Neo4j is an open source product. We support a Community edition under the GPLv3 license. The Enterprise edition is available under the AGPLv3 license for open source projects otherwise under a commercial license from https://info.neotechnology.com/contactus.html[Neo Technology].
+Neo4j Community Edition is an open source product licensed under GPLv3. Neo4j Enterprise Edition offers all the functionality of Community Edition plus Enterprise-specific features. In source code form, Neo4j Enterprise Edition is licensed under AGPLv3. When packaged as a binary, Enterprise Edition includes additional commercial / closed-source components and requires a commercial license from Neo4j Sweden AB or one of its affiliates.
diff --git a/build/AGPL-3-header.txt b/build/AGPL-3-header.txt
@@ -0,0 +1,21 @@
+Copyright (c) ${inceptionYear}-${currentYear} "Neo4j,"
+Neo4j Sweden AB [http://neo4j.com]
+
+This file is part of Neo4j Enterprise Edition. The included source
+code can be redistributed and/or modified under the terms of the
+GNU AFFERO GENERAL PUBLIC LICENSE Version 3
+(http://www.fsf.org/licensing/licenses/agpl-3.0.html) with the
+Commons Clause, as found in the associated LICENSE.txt file.
+
+This program 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 Affero General Public License for more details.
+
+Neo4j object code can be licensed independently from the source
+under separate terms from the AGPL. Inquiries can be directed to:
+licensing@neo4j.com
+
+More information is also available at:
+https://neo4j.com/licensing/
+
diff --git a/build/GPL-3-header.txt b/build/GPL-3-header.txt
@@ -0,0 +1,18 @@
+Copyright (c) ${inceptionYear}-${currentYear} "Neo4j,"
+Neo4j Sweden AB [http://neo4j.com]
+
+This file is part of Neo4j.
+
+Neo4j 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 3 of the License, or
+(at your option) any later version.
+
+This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
diff --git a/build/checkstyle.xml b/build/checkstyle.xml
@@ -11,7 +11,7 @@
   <!-- Require license headers (GPL, AGPL or Apache 2.0) -->
   <module name="RegexpSingleline">
     <property name="format"
-              value="^(\s|\*)*Copyright \(c\) 2002-[0-9]{4} &quot;Neo Technology,&quot;*$|^(\s|\*)*Licensed to Neo Technology under one or more contributor*$"/>
+              value="^(\s|\*)*Copyright \(c\) 2002-[0-9]{4} &quot;Neo4j,&quot;*$|^(\s|\*)*Licensed to Neo4j under one or more contributor*$"/>
     <property name="minimum" value="1"/>
     <property name="maximum" value="1"/>
     <property name="message" value="Missing, wrong or duplicated license header"/>

diff --git a/community/LICENSE.txt b/community/LICENSE.txt
@@ -3,14 +3,14 @@ This package contains software licensed under different
 licenses, please refer to the NOTICE.txt file for further
 information.
 
-The software ("Software") developed and owned by Network Engine for
-Objects in Lund AB (referred to in this notice as "Neo Technology") is
-licensed under the GNU GENERAL PUBLIC LICENSE Version 3 to all third
+The software ("Software") developed and owned by Neo4j Sweden AB
+(referred to in this notice as "Neo4j") is licensed under the
+GNU GENERAL PUBLIC LICENSE Version 3 to all third
 parties and that license is included below.
 
 However, if you have executed an End User Software License and Services
 Agreement or an OEM Software License and Support Services Agreement, or
-another commercial license agreement with Neo Technology or one of its
+another commercial license agreement with Neo4j or one of its
 affiliates (each, a "Commercial Agreement"), the terms of the license in
 such Commercial Agreement will supersede the GNU GENERAL PUBLIC LICENSE
 Version 3 and you may use the Software solely pursuant to the terms of

diff --git a/community/NOTICE.txt b/community/NOTICE.txt
@@ -1,20 +1,19 @@
 Neo4j
-Copyright © 2002-2018 Network Engine for Objects in Lund AB (referred to
-in this notice as "Neo Technology")
-   [http://neotechnology.com]
+Copyright © 2002-2018 Neo4j Sweden AB (referred to in this notice as "Neo4j")
+[http://neo4j.com]
 
-This product includes software ("Software") developed by Neo Technology.
+This product includes software ("Software") developed by Neo4j.
 
 The copyright in the bundled Neo4j graph database (including the
-Software) is owned by Neo Technology. The Software developed and owned
-by Neo Technology is licensed under the GNU GENERAL PUBLIC LICENSE
-Version 3 (http://www.fsf.org/licensing/licenses/gpl-3.0.html) ("GPL")
+Software) is owned by Neo4j. The Software developed and owned
+by Neo4j is licensed under the GNU GENERAL PUBLIC LICENSE Version 3
+(http://www.fsf.org/licensing/licenses/gpl-3.0.html) ("GPL")
 to all third parties and that license, as required by the GPL, is
 included in the LICENSE.txt file.
 
 However, if you have executed an End User Software License and Services
 Agreement or an OEM Software License and Support Services Agreement, or
-another commercial license agreement with Neo Technology or one of its
+another commercial license agreement with Neo4j or one of its
 affiliates (each, a "Commercial Agreement"), the terms of the license in
 such Commercial Agreement will supersede the GPL and you may use the
 software solely pursuant to the terms of the relevant Commercial

diff --git a/community/bolt/LICENSE.txt b/community/bolt/LICENSE.txt
@@ -3,14 +3,14 @@ This package contains software licensed under different
 licenses, please refer to the NOTICE.txt file for further
 information and LICENSES.txt for full license texts.
 
-The software ("Software") developed and owned by Network Engine for
-Objects in Lund AB (referred to in this notice as "Neo Technology") is
-licensed under the GNU GENERAL PUBLIC LICENSE Version 3 to all third
+The software ("Software") developed and owned by Neo4j Sweden AB
+(referred to in this notice as "Neo4j") is licensed under the
+GNU GENERAL PUBLIC LICENSE Version 3 to all third
 parties and that license is included below.
 
 However, if you have executed an End User Software License and Services
 Agreement or an OEM Software License and Support Services Agreement, or
-another commercial license agreement with Neo Technology or one of its
+another commercial license agreement with Neo4j or one of its
 affiliates (each, a "Commercial Agreement"), the terms of the license in
 such Commercial Agreement will supersede the GNU GENERAL PUBLIC LICENSE
 Version 3 and you may use the Software solely pursuant to the terms of

diff --git a/community/bolt/NOTICE.txt b/community/bolt/NOTICE.txt
@@ -1,20 +1,19 @@
 Neo4j
-Copyright © 2002-2018 Network Engine for Objects in Lund AB (referred to
-in this notice as "Neo Technology")
-   [http://neotechnology.com]
+Copyright © 2002-2018 Neo4j Sweden AB (referred to in this notice as "Neo4j")
+[http://neo4j.com]
 
-This product includes software ("Software") developed by Neo Technology.
+This product includes software ("Software") developed by Neo4j.
 
 The copyright in the bundled Neo4j graph database (including the
-Software) is owned by Neo Technology. The Software developed and owned
-by Neo Technology is licensed under the GNU GENERAL PUBLIC LICENSE
-Version 3 (http://www.fsf.org/licensing/licenses/gpl-3.0.html) ("GPL")
+Software) is owned by Neo4j. The Software developed and owned
+by Neo4j is licensed under the GNU GENERAL PUBLIC LICENSE Version 3
+(http://www.fsf.org/licensing/licenses/gpl-3.0.html) ("GPL")
 to all third parties and that license, as required by the GPL, is
 included in the LICENSE.txt file.
 
 However, if you have executed an End User Software License and Services
 Agreement or an OEM Software License and Support Services Agreement, or
-another commercial license agreement with Neo Technology or one of its
+another commercial license agreement with Neo4j or one of its
 affiliates (each, a "Commercial Agreement"), the terms of the license in
 such Commercial Agreement will supersede the GPL and you may use the
 software solely pursuant to the terms of the relevant Commercial

diff --git a/community/bolt/pom.xml b/community/bolt/pom.xml
@@ -12,7 +12,7 @@
   </parent>
 
   <properties>
-    <license-text.header>GPL-3-header.txt</license-text.header>
+    <license-text.header>../../build/GPL-3-header.txt</license-text.header>
     <licensing.prepend.text>notice-gpl-prefix.txt</licensing.prepend.text>
   </properties>
 
@@ -26,14 +26,13 @@
     <license>
       <name>GNU General Public License, Version 3</name>
       <url>http://www.gnu.org/licenses/gpl-3.0-standalone.html</url>
-      <comments>The software ("Software") developed and owned by Network Engine for
-        Objects in Lund AB (referred to in this notice as "Neo Technology") is
+      <comments>The software ("Software") developed and owned by Neo4j Sweden AB (referred to in this notice as "Neo4j") is
         licensed under the GNU GENERAL PUBLIC LICENSE Version 3 to all third
         parties and that license is included below.
 
         However, if you have executed an End User Software License and Services
         Agreement or an OEM Software License and Support Services Agreement, or
-        another commercial license agreement with Neo Technology or one of its
+        another commercial license agreement with Neo4j or one of its
         affiliates (each, a "Commercial Agreement"), the terms of the license in
         such Commercial Agreement will supersede the GNU GENERAL PUBLIC LICENSE
         Version 3 and you may use the Software solely pursuant to the terms of

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/BoltKernelExtension.java b/community/bolt/src/main/java/org/neo4j/bolt/BoltKernelExtension.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2018 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ * Copyright (c) 2002-2018 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.
  *
@@ -19,16 +19,16 @@
  */
 package org.neo4j.bolt;
 
-import io.netty.channel.Channel;
-import io.netty.handler.ssl.SslContext;
-import io.netty.util.internal.logging.InternalLoggerFactory;
-
 import java.time.Clock;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.BiFunction;
 
+import io.netty.channel.Channel;
+import io.netty.handler.ssl.SslContext;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+
 import org.neo4j.bolt.security.auth.Authentication;
 import org.neo4j.bolt.security.auth.BasicAuthentication;
 import org.neo4j.bolt.transport.BoltProtocol;

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/security/auth/Authentication.java b/community/bolt/src/main/java/org/neo4j/bolt/security/auth/Authentication.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2018 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ * Copyright (c) 2002-2018 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.
  *

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/security/auth/AuthenticationException.java b/community/bolt/src/main/java/org/neo4j/bolt/security/auth/AuthenticationException.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2018 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ * Copyright (c) 2002-2018 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.
  *

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/security/auth/AuthenticationResult.java b/community/bolt/src/main/java/org/neo4j/bolt/security/auth/AuthenticationResult.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2018 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ * Copyright (c) 2002-2018 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.
  *

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/security/auth/BasicAuthentication.java b/community/bolt/src/main/java/org/neo4j/bolt/security/auth/BasicAuthentication.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2018 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ * Copyright (c) 2002-2018 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.
  *

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/security/auth/BasicAuthenticationResult.java b/community/bolt/src/main/java/org/neo4j/bolt/security/auth/BasicAuthenticationResult.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2018 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ * Copyright (c) 2002-2018 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.
  *

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/transport/BoltProtocol.java b/community/bolt/src/main/java/org/neo4j/bolt/transport/BoltProtocol.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2018 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ * Copyright (c) 2002-2018 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.
  *

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/transport/HandshakeOutcome.java b/community/bolt/src/main/java/org/neo4j/bolt/transport/HandshakeOutcome.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2018 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ * Copyright (c) 2002-2018 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.
  *

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/transport/Netty4LoggerFactory.java b/community/bolt/src/main/java/org/neo4j/bolt/transport/Netty4LoggerFactory.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2018 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ * Copyright (c) 2002-2018 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.
  *

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/transport/NettyServer.java b/community/bolt/src/main/java/org/neo4j/bolt/transport/NettyServer.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2018 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ * Copyright (c) 2002-2018 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.
  *

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/transport/ProtocolChooser.java b/community/bolt/src/main/java/org/neo4j/bolt/transport/ProtocolChooser.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2018 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ * Copyright (c) 2002-2018 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.
  *

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/transport/SocketTransport.java b/community/bolt/src/main/java/org/neo4j/bolt/transport/SocketTransport.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2018 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ * Copyright (c) 2002-2018 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.
  *

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/transport/SocketTransportHandler.java b/community/bolt/src/main/java/org/neo4j/bolt/transport/SocketTransportHandler.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2018 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ * Copyright (c) 2002-2018 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.
  *

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/transport/TransportSelectionHandler.java b/community/bolt/src/main/java/org/neo4j/bolt/transport/TransportSelectionHandler.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2018 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ * Copyright (c) 2002-2018 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.
  *

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/transport/WebSocketFrameTranslator.java b/community/bolt/src/main/java/org/neo4j/bolt/transport/WebSocketFrameTranslator.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2018 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ * Copyright (c) 2002-2018 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.
  *

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltIOException.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltIOException.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2018 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ * Copyright (c) 2002-2018 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.
  *

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltMessageRouter.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltMessageRouter.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2018 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ * Copyright (c) 2002-2018 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.
  *

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltRequestMessage.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltRequestMessage.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2018 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ * Copyright (c) 2002-2018 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.
  *

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltRequestMessageHandler.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltRequestMessageHandler.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2018 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ * Copyright (c) 2002-2018 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.
  *

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltRequestMessageReader.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltRequestMessageReader.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2018 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ * Copyright (c) 2002-2018 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.
  *

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltResponseMessage.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltResponseMessage.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2018 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ * Copyright (c) 2002-2018 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.
  *