Permalink
Browse files

Updated and extended the license information.

  • Loading branch information...
1 parent 85c8864 commit 88e3c0ccf6dad007be72ad63cc05a95841ad8a97 @nawroth nawroth committed Apr 10, 2011
View
@@ -1,4 +1,24 @@
- GNU GENERAL PUBLIC LICENSE
+NOTICE
+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
+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
+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
+the relevant Commercial Agreement.
+
+
+
+ GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
View
@@ -1,11 +1,28 @@
Neo4j
-
-Copyright (c) 2002-2011 "Neo Technology," Network Engine for Objects in Lund AB
+Copyright © 2002-2011 Network Engine for Objects in Lund AB (referred to
+in this notice as “Neo Technology”)
[http://neotechnology.com]
-This product includes software developed by "Neo Technology,"
-Network Engine for Objects in Lund AB (http://neotechnology.com).
+This product includes software ("Software") developed by Neo Technology.
+
+The copyright in the bundled Neo4j bundled 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.
+
+Third party libraries
+---------------------
-For licensing information, see COPYRIGHT.txt and LICENSE.txt.
+See the NOTICE.txt and LICENSES.txt files in the subdirectories for
+information on included third party software.
-For more information, contact info@neotechnology.com.
@@ -7,6 +7,20 @@ see the NOTICE.txt file.
License for the included Neo4j libraries
----------------------------------------
+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
+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
+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
+the relevant Commercial Agreement.
+
+
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
@@ -3,20 +3,22 @@ Neo4j examples
Copyright (c) 2010-2011 "Neo Technology," Network Engine for Objects in Lund AB
[http://neotechnology.com]
-This package includes software developed at
-"Neo Technology," Network Engine for Objects in Lund AB
-(http://neotechnology.com).
-
-For licensing information, see COPYRIGHT.txt and LICENSE.txt.
-
-The included example code is copyright "Neo Technology,"
-Network Engine for Objects in Lund AB and licensed
-under the Apache License version 2.0.
-
-The bundled graph database engine is copyright
-"Neo Technology," Network Engine for Objects in Lund AB
-and licensed under the GNU AFFERO GENERAL PUBLIC LICENSE
-Version 3 (http://www.fsf.org/licensing/licenses/agpl-3.0.html).
+This product includes software ("Software") developed by Neo Technology.
+
+The copyright in the bundled Neo4j bundled 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.
Third party libraries
View
@@ -9,13 +9,11 @@
<parent>
<groupId>org.neo4j.examples</groupId>
<artifactId>examples-pom</artifactId>
- <version>19</version>
+ <version>21</version>
</parent>
<scm>
- <connection>scm:git:git://github.com/neo4j/examples.git</connection>
- <developerConnection>scm:git:git@github.com:neo4j/examples.git</developerConnection>
- <url>https://github.com/neo4j/examples</url>
+ <url>https://github.com/neo4j/community</url>
</scm>
<properties>
@@ -326,4 +324,30 @@
</site>
</distributionManagement>
+ <repositories>
+ <repository>
+ <id>neo4j-release-repository</id>
+ <name>Neo4j Maven 2 release repository</name>
+ <url>http://m2.neo4j.org/releases</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>neo4j-snapshot-repository</id>
+ <name>Neo4j Maven 2 snapshot repository</name>
+ <url>http://m2.neo4j.org/snapshots</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
</project>
+
View
@@ -1,4 +1,24 @@
- GNU GENERAL PUBLIC LICENSE
+NOTICE
+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
+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
+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
+the relevant Commercial Agreement.
+
+
+
+ GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Oops, something went wrong.

0 comments on commit 88e3c0c

Please sign in to comment.