Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'parent-33' of https://github.com/nawroth/enterprise

  • Loading branch information...
commit a8ab9e1da5d2803a112b04869fb699d99cc1795b 2 parents f85f17d + 8cc2bbb
@simpsonjulian simpsonjulian authored
View
2  backup/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.neo4j.build</groupId>
<artifactId>parent-central</artifactId>
- <version>31</version>
+ <version>33</version>
<relativePath />
</parent>
<groupId>org.neo4j</groupId>
View
3  com/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.neo4j.build</groupId>
<artifactId>parent-central</artifactId>
- <version>31</version>
+ <version>33</version>
<relativePath />
</parent>
<groupId>org.neo4j</groupId>
@@ -17,6 +17,7 @@
<bundle.namespace>org.neo4j.com</bundle.namespace>
<neo4j.version>1.7-SNAPSHOT</neo4j.version>
<docs.url>http://docs.neo4j.org/chunked/${project.version}/</docs.url>
+ <docs-plugin.skip>true</docs-plugin.skip>
</properties>
<scm>
View
2  ha/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.neo4j.build</groupId>
<artifactId>parent-central</artifactId>
- <version>31</version>
+ <version>33</version>
<relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
View
3  neo4j-enterprise/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.neo4j.build</groupId>
<artifactId>parent-central</artifactId>
- <version>31</version>
+ <version>33</version>
<relativePath />
</parent>
@@ -21,6 +21,7 @@
<bundle.namespace>org.neo4j</bundle.namespace>
<neo4j.version>1.7-SNAPSHOT</neo4j.version>
<docs.url>http://docs.neo4j.org/chunked/${project.version}/deployment-installation.html#editions</docs.url>
+ <docs-plugin.skip>true</docs-plugin.skip>
</properties>
<scm>
View
62 neo4j-enterprise/src/docs/ops/upgrades.txt
@@ -1,62 +0,0 @@
-[[deployment-upgrading]]
-Upgrading
-=========
-
-Normally a properly shutdown Neo4j database can be upgraded directly to a new minor version.
-A database can be upgraded from a minor version to the next, e.g. 1.1 -> 1.2, and 1.2 -> 1.3,
-but you can not jump directly from 1.1 -> 1.3.
-The upgrade process is a one way step; databases cannot be downgraded.
-
-However, some upgrades make significant changes to the database store. Neo4j will refuse to start when a significant upgrade is required, requiring explicit upgrade configuration.
-
-== Normal Upgrade ==
-
-To perform a normal upgrade (for minor changes to the database store):
-
-. download the newer version of Neo4j
-. cleanly shutdown the database to upgrade, if it is running
-. startup the database with the newer version of Neo4j
-
-== Special Upgrade ==
-
-To perform a special upgrade (for significant changes to the database store):
-
-. make sure the database you are upgrading has been cleanly shut down
-. set the Neo4j configuration parameter "allow_store_upgrade=true"
-. start the database
-. the upgrade will happen during startup and the process is done when the database has been successfully started
-. "allow_store_upgrade=true" configuration parameter should be removed, set to "false" or commented out
-
-
-[[deployment-upgrading-one-three-milestones]]
-== Upgrade 1.3.M03 -> 1.3.M04 ==
-
-[WARNING]
-Upgrading from 1.3.M03 -> 1.3.M04 must be done explicitly since store format has changed between those two versions.
-
-The store format, as well as logical log format, have changed between these two versions to allow for bigger stores.
-
-
-[[deployment-upgrading-one-three]]
-== Upgrade 1.2 -> 1.3 ==
-
-[WARNING]
-Upgrading from 1.2 -> 1.3 must be done explicitly since store format has changed between those two versions.
-
-The store format, as well as logical log format, have changed between these two versions to allow for bigger stores.
-
-[IMPORTANT]
-Although id ranges has been increased the space used to store the database will not increase compared to the previous version.
-
-Upgrading between these two version needs to be performed explicitly using a configuration parameter at startup (see "Special Upgrade").
-
-[CAUTION]
-Upgrade cannot be performed if either the number of relationship types or the configured block size for either the dynamic array store or string store is greater than 65534.
-
-[CAUTION]
-Indexes created using the old IndexService/LuceneIndexService are no longer accessible out of the box in 1.3 in favor of the integrated index. An automatic upgrade isn't possible so a full rebuild of the index data into the integrated index framework is required. For reference the legacy index can be downloaded from the Neo4j repository, http://m2.neo4j.org/org/neo4j/neo4j-legacy-index/
-
-[[deployment-upgrading-one-two]]
-== Upgrade 1.1 -> 1.2 ==
-
-Upgrading from Neo4j 1.1 to Neo4j 1.2 is a "normal" upgrade.
View
21 neo4j-enterprise/src/main/resources/pom.xml
@@ -1,4 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2002-2012 "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/>.
+
+-->
<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">
<modelVersion>4.0.0</modelVersion>
View
2  pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.neo4j.build</groupId>
<artifactId>parent-central</artifactId>
- <version>31</version>
+ <version>33</version>
<relativePath />
</parent>
View
3  server-enterprise/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.neo4j.build</groupId>
<artifactId>parent-pom</artifactId>
- <version>31</version>
+ <version>33</version>
<relativePath />
</parent>
@@ -36,6 +36,7 @@
<neo4j.version>1.7-SNAPSHOT</neo4j.version>
<docs.url>http://docs.neo4j.org/chunked/${project.version}/server.html</docs.url>
+ <docs-plugin.skip>true</docs-plugin.skip>
</properties>
<packaging>jar</packaging>
Please sign in to comment.
Something went wrong with that request. Please try again.