Merge pull request #8391 from jimwebber/3.1-community-agpl-gpl

Returning community NOTICE.txt to a previous gpl-friendly state

community/NOTICE.txt

@@ -5,22 +5,36 @@ in this notice as "Neo Technology")
 
 This product includes software ("Software") developed by Neo Technology.
 
-The software ("Software") is developed and owned by Network Engine
-for Objects in Lund AB (referred to in this notice as "Neo Technology").
-If you have executed an End User Software License and Services Agreement,
-an OEM Software License and Support Services Agreement, or another
-commercial license agreement (including an Evaluation Agreement) with
-Neo Technology or one of its affiliates (each, a "Commercial Agreement"),
-you may use the Software solely pursuant to the terms of the relevant
-Commercial Agreement.
-
-If you have not executed a Commercial Agreement with Neo Technology, the
-Software is subject to the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-Version 3 (http://www.fsf.org/licensing/licenses/agpl-3.0.html), included
-in the LICENSE.txt file.
+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")
+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
+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
+Agreement.
 
 Full license texts are found in LICENSES.txt.
 
 Third-party licenses
 --------------------
 
+Apache Software License, Version 2.0
+  Apache Commons Lang
+  ConcurrentLinkedHashMap
+  Lucene Core
+  opencsv
+  parboiled-core
+  parboiled-scala
+
+BSD - Scala License
+  Scala Library
+
+BSD License
+  Scala Compiler

community/server/pom.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2002-2016 "Neo Technology,"
-  Network Engine for Objects in Lund AB [http://neotechnology.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 Affero 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 Affero General Public License for more details.
-
-  You should have received a copy of the GNU Affero General Public License
-  along with this program. If not, see <http://www.gnu.org/licenses />.
+   Network Engine for Objects in Lund AB [http://neotechnology.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/>.
   -->
 
 <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/maven-v4_0_0.xsd">