diff --git a/community/lucene-index/pom.xml b/community/lucene-index/pom.xml
index b7b3d31fec600..aad755ccc76e4 100644
--- a/community/lucene-index/pom.xml
+++ b/community/lucene-index/pom.xml
@@ -131,6 +131,15 @@ the relevant Commercial Agreement.
${project.version}
test
+
+
+ org.neo4j.doc
+ neo4j-doc-tools
+ ${project.version}
+ test
+ test-jar
+
+
diff --git a/community/lucene-index/src/test/java/examples/ImdbDocTest.java b/community/lucene-index/src/test/java/examples/ImdbDocTest.java
index eb3e8ad734625..f6dc542faeb83 100644
--- a/community/lucene-index/src/test/java/examples/ImdbDocTest.java
+++ b/community/lucene-index/src/test/java/examples/ImdbDocTest.java
@@ -40,6 +40,7 @@
import java.util.Map;
import java.util.Set;
+import org.neo4j.doc.tools.AsciiDocGenerator;
import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.Relationship;
@@ -54,7 +55,6 @@
import org.neo4j.index.lucene.QueryContext;
import org.neo4j.index.lucene.ValueContext;
import org.neo4j.index.lucene.unsafe.batchinsert.LuceneBatchInserterIndexProvider;
-import org.neo4j.test.AsciiDocGenerator;
import org.neo4j.test.TestGraphDatabaseFactory;
import org.neo4j.unsafe.batchinsert.BatchInserter;
import org.neo4j.unsafe.batchinsert.BatchInserterIndex;
diff --git a/community/server/pom.xml b/community/server/pom.xml
index 5de68acfc8969..8f728f8a45add 100644
--- a/community/server/pom.xml
+++ b/community/server/pom.xml
@@ -329,6 +329,15 @@
20090211
test
+
+
+ org.neo4j.doc
+ neo4j-doc-tools
+ ${project.version}
+ test
+ test-jar
+
+
diff --git a/community/server/src/test/java/org/neo4j/server/rest/ManageNodeDocIT.java b/community/server/src/test/java/org/neo4j/server/rest/ManageNodeDocIT.java
index 13fd8c0a64334..2f42d3a2178ba 100644
--- a/community/server/src/test/java/org/neo4j/server/rest/ManageNodeDocIT.java
+++ b/community/server/src/test/java/org/neo4j/server/rest/ManageNodeDocIT.java
@@ -42,6 +42,7 @@
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
+import org.neo4j.doc.metatest.TestJavaTestDocsGenerator;
import org.neo4j.helpers.FakeClock;
import org.neo4j.kernel.GraphDatabaseDependencies;
import org.neo4j.kernel.configuration.Config;
@@ -52,7 +53,6 @@
import org.neo4j.kernel.monitoring.Monitors;
import org.neo4j.logging.LogProvider;
import org.neo4j.logging.NullLogProvider;
-import org.neo4j.metatest.TestJavaTestDocsGenerator;
import org.neo4j.server.CommunityNeoServer;
import org.neo4j.server.NeoServer;
import org.neo4j.server.configuration.ServerSettings;
diff --git a/community/server/src/test/java/org/neo4j/server/rest/RESTDocsGenerator.java b/community/server/src/test/java/org/neo4j/server/rest/RESTDocsGenerator.java
index 0aa150077c4af..dd2886abfafa3 100644
--- a/community/server/src/test/java/org/neo4j/server/rest/RESTDocsGenerator.java
+++ b/community/server/src/test/java/org/neo4j/server/rest/RESTDocsGenerator.java
@@ -41,10 +41,10 @@
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
+import org.neo4j.doc.tools.AsciiDocGenerator;
import org.neo4j.function.Predicates;
import org.neo4j.graphdb.Transaction;
import org.neo4j.helpers.collection.Pair;
-import org.neo4j.test.AsciiDocGenerator;
import org.neo4j.test.GraphDefinition;
import org.neo4j.test.TestData.Producer;
import org.neo4j.visualization.asciidoc.AsciidocHelper;
diff --git a/community/shell/pom.xml b/community/shell/pom.xml
index 26c058e59bcdb..116b280759999 100644
--- a/community/shell/pom.xml
+++ b/community/shell/pom.xml
@@ -181,6 +181,14 @@ the relevant Commercial Agreement.
test-jar
test
+
+
+ org.neo4j.doc
+ neo4j-doc-tools
+ ${project.version}
+ test
+ test-jar
+
diff --git a/community/shell/src/test/java/org/neo4j/shell/Documenter.java b/community/shell/src/test/java/org/neo4j/shell/Documenter.java
index 0c8808cecbb38..a3fea16cfff78 100644
--- a/community/shell/src/test/java/org/neo4j/shell/Documenter.java
+++ b/community/shell/src/test/java/org/neo4j/shell/Documenter.java
@@ -27,11 +27,11 @@
import java.util.HashMap;
import java.util.Stack;
+import org.neo4j.doc.tools.AsciiDocGenerator;
import org.neo4j.helpers.Exceptions;
import org.neo4j.shell.impl.CollectingOutput;
import org.neo4j.shell.impl.RemoteOutput;
import org.neo4j.shell.impl.SameJvmClient;
-import org.neo4j.test.AsciiDocGenerator;
import static org.junit.Assert.*;
diff --git a/doctools/pom.xml b/doctools/pom.xml
new file mode 100644
index 0000000000000..6301f61ac6d46
--- /dev/null
+++ b/doctools/pom.xml
@@ -0,0 +1,74 @@
+
+
+
+ parent
+ org.neo4j
+ 3.0.7-SNAPSHOT
+ ..
+
+ 4.0.0
+
+ org.neo4j.doc
+ neo4j-doc-tools
+ 3.0.7-SNAPSHOT
+
+ jar
+ Neo4j - Documentation Tools
+ Tools for building documentation for various Neo4j components.
+
+
+ GPL-3-header.txt
+ notice-gpl-prefix.txt
+
+
+
+
+ GNU General Public License, Version 3
+ http://www.gnu.org/licenses/gpl-3.0-standalone.html
+ 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.
+
+
+
+
+
+
+ org.neo4j
+ neo4j-kernel
+ ${project.version}
+
+
+
+ junit
+ junit
+ test
+
+
+ org.neo4j
+ neo4j-kernel
+ ${project.version}
+ test
+ test-jar
+
+
+ org.neo4j
+ neo4j-io
+ ${project.version}
+ test
+ test-jar
+
+
+
+
diff --git a/community/kernel/src/test/java/org/neo4j/metatest/AsciiDocGeneratorTest.java b/doctools/src/test/java/org/neo4j/doc/metatest/AsciiDocGeneratorTest.java
similarity index 97%
rename from community/kernel/src/test/java/org/neo4j/metatest/AsciiDocGeneratorTest.java
rename to doctools/src/test/java/org/neo4j/doc/metatest/AsciiDocGeneratorTest.java
index cbd601e9e53c8..2eff9dc00ec63 100644
--- a/community/kernel/src/test/java/org/neo4j/metatest/AsciiDocGeneratorTest.java
+++ b/doctools/src/test/java/org/neo4j/doc/metatest/AsciiDocGeneratorTest.java
@@ -17,16 +17,16 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.neo4j.metatest;
+package org.neo4j.doc.metatest;
+
+import java.io.File;
+import java.io.IOException;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import java.io.File;
-import java.io.IOException;
-
-import org.neo4j.test.AsciiDocGenerator;
+import org.neo4j.doc.tools.AsciiDocGenerator;
import org.neo4j.test.TargetDirectory;
import static org.junit.Assert.assertEquals;
diff --git a/community/kernel/src/test/java/org/neo4j/metatest/TestJavaTestDocsGenerator.java b/doctools/src/test/java/org/neo4j/doc/metatest/TestJavaTestDocsGenerator.java
similarity index 98%
rename from community/kernel/src/test/java/org/neo4j/metatest/TestJavaTestDocsGenerator.java
rename to doctools/src/test/java/org/neo4j/doc/metatest/TestJavaTestDocsGenerator.java
index 8ffa08d060d6f..30088c67e9dfe 100644
--- a/community/kernel/src/test/java/org/neo4j/metatest/TestJavaTestDocsGenerator.java
+++ b/doctools/src/test/java/org/neo4j/doc/metatest/TestJavaTestDocsGenerator.java
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.neo4j.metatest;
+package org.neo4j.doc.metatest;
import org.junit.AfterClass;
import org.junit.Before;
@@ -36,7 +36,7 @@
import org.neo4j.test.GraphDescription;
import org.neo4j.test.GraphDescription.Graph;
import org.neo4j.test.GraphHolder;
-import org.neo4j.test.JavaTestDocsGenerator;
+import org.neo4j.doc.tools.JavaTestDocsGenerator;
import org.neo4j.test.TargetDirectory;
import org.neo4j.test.TestData;
import org.neo4j.test.TestGraphDatabaseFactory;
diff --git a/community/kernel/src/test/java/org/neo4j/test/AsciiDocGenerator.java b/doctools/src/test/java/org/neo4j/doc/tools/AsciiDocGenerator.java
similarity index 99%
rename from community/kernel/src/test/java/org/neo4j/test/AsciiDocGenerator.java
rename to doctools/src/test/java/org/neo4j/doc/tools/AsciiDocGenerator.java
index ea2b0abccc3b9..1edd72ae74c1b 100644
--- a/community/kernel/src/test/java/org/neo4j/test/AsciiDocGenerator.java
+++ b/doctools/src/test/java/org/neo4j/doc/tools/AsciiDocGenerator.java
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.neo4j.test;
+package org.neo4j.doc.tools;
import java.io.File;
import java.io.FileOutputStream;
diff --git a/community/kernel/src/test/java/org/neo4j/test/JavaDocsGenerator.java b/doctools/src/test/java/org/neo4j/doc/tools/JavaDocsGenerator.java
similarity index 98%
rename from community/kernel/src/test/java/org/neo4j/test/JavaDocsGenerator.java
rename to doctools/src/test/java/org/neo4j/doc/tools/JavaDocsGenerator.java
index 867f50e591c2f..68ae98d18115a 100644
--- a/community/kernel/src/test/java/org/neo4j/test/JavaDocsGenerator.java
+++ b/doctools/src/test/java/org/neo4j/doc/tools/JavaDocsGenerator.java
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.neo4j.test;
+package org.neo4j.doc.tools;
import java.io.File;
import java.io.IOException;
diff --git a/community/kernel/src/test/java/org/neo4j/test/JavaTestDocsGenerator.java b/doctools/src/test/java/org/neo4j/doc/tools/JavaTestDocsGenerator.java
similarity index 97%
rename from community/kernel/src/test/java/org/neo4j/test/JavaTestDocsGenerator.java
rename to doctools/src/test/java/org/neo4j/doc/tools/JavaTestDocsGenerator.java
index 76da6076217e2..9957d46edad6b 100644
--- a/community/kernel/src/test/java/org/neo4j/test/JavaTestDocsGenerator.java
+++ b/doctools/src/test/java/org/neo4j/doc/tools/JavaTestDocsGenerator.java
@@ -17,14 +17,14 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.neo4j.test;
+package org.neo4j.doc.tools;
import java.io.File;
import java.io.IOException;
import java.io.Writer;
import org.neo4j.test.TestData.Producer;
-
+import org.neo4j.test.GraphDefinition;
/**
* This class is supporting the generation of ASCIIDOC documentation
diff --git a/enterprise/ha/pom.xml b/enterprise/ha/pom.xml
index 3de723fb9d28b..790eb7e34fdc5 100644
--- a/enterprise/ha/pom.xml
+++ b/enterprise/ha/pom.xml
@@ -189,5 +189,14 @@
commons-io
test
+
+
+ org.neo4j.doc
+ neo4j-doc-tools
+ ${project.version}
+ test
+ test-jar
+
+
diff --git a/enterprise/ha/src/test/java/jmx/JmxDocTest.java b/enterprise/ha/src/test/java/jmx/JmxDocTest.java
index f23bdc95de553..e96ff58374776 100644
--- a/enterprise/ha/src/test/java/jmx/JmxDocTest.java
+++ b/enterprise/ha/src/test/java/jmx/JmxDocTest.java
@@ -48,13 +48,13 @@
import javax.management.ObjectName;
import org.neo4j.cluster.ClusterSettings;
+import org.neo4j.doc.tools.AsciiDocGenerator;
import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.graphdb.factory.GraphDatabaseBuilder;
import org.neo4j.graphdb.factory.TestHighlyAvailableGraphDatabaseFactory;
import org.neo4j.helpers.collection.Iterators;
import org.neo4j.kernel.configuration.docs.SettingDescription;
import org.neo4j.kernel.configuration.docs.AsciiDocListGenerator;
-import org.neo4j.test.AsciiDocGenerator;
import org.neo4j.test.TargetDirectory;
import static org.junit.Assert.assertEquals;
diff --git a/enterprise/server-enterprise/pom.xml b/enterprise/server-enterprise/pom.xml
index 74e3c59afdff3..b32a02f61a107 100644
--- a/enterprise/server-enterprise/pom.xml
+++ b/enterprise/server-enterprise/pom.xml
@@ -157,6 +157,15 @@
${project.version}
runtime
+
+
+ org.neo4j.doc
+ neo4j-doc-tools
+ ${project.version}
+ test
+ test-jar
+
+
diff --git a/manual/cypher/cypher-docs/pom.xml b/manual/cypher/cypher-docs/pom.xml
index bb90b6d2158d0..71d46ae0616f4 100644
--- a/manual/cypher/cypher-docs/pom.xml
+++ b/manual/cypher/cypher-docs/pom.xml
@@ -149,6 +149,14 @@
test
+
+ org.neo4j.doc
+ neo4j-doc-tools
+ ${project.version}
+ test
+ test-jar
+
+
diff --git a/manual/cypher/cypher-docs/src/test/java/org/neo4j/cypher/example/IntroDocTest.java b/manual/cypher/cypher-docs/src/test/java/org/neo4j/cypher/example/IntroDocTest.java
index fd8e3d706c5e4..ef174c0089625 100644
--- a/manual/cypher/cypher-docs/src/test/java/org/neo4j/cypher/example/IntroDocTest.java
+++ b/manual/cypher/cypher-docs/src/test/java/org/neo4j/cypher/example/IntroDocTest.java
@@ -29,14 +29,14 @@
import org.junit.Rule;
import org.junit.Test;
+import org.neo4j.doc.tools.AsciiDocGenerator;
+import org.neo4j.doc.tools.JavaTestDocsGenerator;
import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.Transaction;
-import org.neo4j.test.AsciiDocGenerator;
import org.neo4j.test.GraphDescription;
import org.neo4j.test.GraphDescription.Graph;
import org.neo4j.test.GraphHolder;
-import org.neo4j.test.JavaTestDocsGenerator;
import org.neo4j.test.TestData;
import org.neo4j.test.TestGraphDatabaseFactory;
import org.neo4j.visualization.asciidoc.AsciidocHelper;
diff --git a/manual/cypher/cypher-docs/src/test/java/org/neo4j/cypher/example/JavaExecutionEngineDocTest.java b/manual/cypher/cypher-docs/src/test/java/org/neo4j/cypher/example/JavaExecutionEngineDocTest.java
index e55f9bd8f2c30..af54e9b3c1d0a 100644
--- a/manual/cypher/cypher-docs/src/test/java/org/neo4j/cypher/example/JavaExecutionEngineDocTest.java
+++ b/manual/cypher/cypher-docs/src/test/java/org/neo4j/cypher/example/JavaExecutionEngineDocTest.java
@@ -35,6 +35,7 @@
import java.util.List;
import java.util.Map;
+import org.neo4j.doc.tools.AsciiDocGenerator;
import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.RelationshipType;
@@ -43,7 +44,6 @@
import org.neo4j.helpers.collection.Iterators;
import org.neo4j.kernel.impl.query.QueryExecutionEngine;
import org.neo4j.kernel.internal.GraphDatabaseAPI;
-import org.neo4j.test.AsciiDocGenerator;
import org.neo4j.test.TestGraphDatabaseFactory;
import org.neo4j.visualization.asciidoc.AsciidocHelper;
diff --git a/manual/cypher/cypher-docs/src/test/java/org/neo4j/cypher/example/JavaQueryDocTest.java b/manual/cypher/cypher-docs/src/test/java/org/neo4j/cypher/example/JavaQueryDocTest.java
index 8e8b0ad2e60ee..16c9f9b540c49 100644
--- a/manual/cypher/cypher-docs/src/test/java/org/neo4j/cypher/example/JavaQueryDocTest.java
+++ b/manual/cypher/cypher-docs/src/test/java/org/neo4j/cypher/example/JavaQueryDocTest.java
@@ -22,7 +22,7 @@
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.neo4j.test.JavaDocsGenerator;
+import org.neo4j.doc.tools.JavaDocsGenerator;
import org.neo4j.visualization.asciidoc.AsciidocHelper;
public class JavaQueryDocTest
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/ArticleTest.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/ArticleTest.scala
index c6d40842117bb..25fa950fe0b80 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/ArticleTest.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/ArticleTest.scala
@@ -29,10 +29,11 @@ import org.neo4j.cypher.internal.compiler.v3_0.prettifier.Prettifier
import org.neo4j.cypher.internal.javacompat.GraphImpl
import org.neo4j.cypher.internal.{ExecutionEngine, RewindableExecutionResult}
import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
+import org.neo4j.doc.tools.AsciiDocGenerator
import org.neo4j.graphdb._
import org.neo4j.graphdb.index.Index
import org.neo4j.test.GraphDatabaseServiceCleaner.cleanDatabaseContent
-import org.neo4j.test.{AsciiDocGenerator, GraphDescription, TestGraphDatabaseFactory}
+import org.neo4j.test.{GraphDescription, TestGraphDatabaseFactory}
import org.neo4j.visualization.asciidoc.AsciidocHelper
import org.scalatest.Assertions
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/DocumentingTestBase.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/DocumentingTestBase.scala
index 91a0a641fe659..b936b4884e780 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/DocumentingTestBase.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/DocumentingTestBase.scala
@@ -34,6 +34,7 @@ import org.neo4j.cypher.internal.javacompat.GraphImpl
import org.neo4j.cypher.internal.{ExecutionEngine, RewindableExecutionResult}
import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
import org.neo4j.cypher.{CypherException, ExecutionEngineHelper}
+import org.neo4j.doc.tools.AsciiDocGenerator
import org.neo4j.graphdb._
import org.neo4j.graphdb.factory.GraphDatabaseSettings
import org.neo4j.graphdb.index.Index
@@ -43,7 +44,7 @@ import org.neo4j.kernel.impl.api.index.IndexingService
import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingMode
import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge
import org.neo4j.test.GraphDatabaseServiceCleaner.cleanDatabaseContent
-import org.neo4j.test.{AsciiDocGenerator, GraphDescription, TestGraphDatabaseFactory}
+import org.neo4j.test.{GraphDescription, TestGraphDatabaseFactory}
import org.neo4j.visualization.asciidoc.AsciidocHelper
import org.neo4j.visualization.graphviz.{AsciiDocStyle, GraphStyle, GraphvizWriter}
import org.neo4j.walk.Walker
diff --git a/manual/embedded-examples/pom.xml b/manual/embedded-examples/pom.xml
index ad356404a0dd4..1bfe10ee59467 100644
--- a/manual/embedded-examples/pom.xml
+++ b/manual/embedded-examples/pom.xml
@@ -96,6 +96,14 @@
${project.version}
+
+ org.neo4j.doc
+ neo4j-doc-tools
+ ${project.version}
+ test
+ test-jar
+
+
diff --git a/manual/embedded-examples/src/test/java/org/neo4j/examples/AbstractJavaDocTestBase.java b/manual/embedded-examples/src/test/java/org/neo4j/examples/AbstractJavaDocTestBase.java
index fe9b35c21a5f4..7f1dc9a015900 100644
--- a/manual/embedded-examples/src/test/java/org/neo4j/examples/AbstractJavaDocTestBase.java
+++ b/manual/embedded-examples/src/test/java/org/neo4j/examples/AbstractJavaDocTestBase.java
@@ -25,11 +25,11 @@
import java.util.Map;
+import org.neo4j.doc.tools.JavaTestDocsGenerator;
import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.graphdb.Node;
import org.neo4j.test.GraphDescription;
import org.neo4j.test.GraphHolder;
-import org.neo4j.test.JavaTestDocsGenerator;
import org.neo4j.test.TestData;
import org.neo4j.visualization.asciidoc.AsciidocHelper;
diff --git a/manual/embedded-examples/src/test/java/org/neo4j/examples/EmbeddedNeo4jDocTest.java b/manual/embedded-examples/src/test/java/org/neo4j/examples/EmbeddedNeo4jDocTest.java
index 955721368944d..e6279239e79ba 100644
--- a/manual/embedded-examples/src/test/java/org/neo4j/examples/EmbeddedNeo4jDocTest.java
+++ b/manual/embedded-examples/src/test/java/org/neo4j/examples/EmbeddedNeo4jDocTest.java
@@ -23,7 +23,7 @@
import org.junit.BeforeClass;
import org.junit.Test;
-import org.neo4j.test.JavaDocsGenerator;
+import org.neo4j.doc.tools.JavaDocsGenerator;
import org.neo4j.visualization.asciidoc.AsciidocHelper;
import static org.junit.Assert.assertFalse;
diff --git a/manual/embedded-examples/src/test/java/org/neo4j/examples/MatrixDocTest.java b/manual/embedded-examples/src/test/java/org/neo4j/examples/MatrixDocTest.java
index c2bdb6c4b2000..15b91835cf57f 100644
--- a/manual/embedded-examples/src/test/java/org/neo4j/examples/MatrixDocTest.java
+++ b/manual/embedded-examples/src/test/java/org/neo4j/examples/MatrixDocTest.java
@@ -21,7 +21,7 @@
import org.junit.BeforeClass;
import org.junit.Test;
-import org.neo4j.test.JavaDocsGenerator;
+import org.neo4j.doc.tools.JavaDocsGenerator;
import static org.junit.Assert.assertTrue;
diff --git a/manual/embedded-examples/src/test/java/org/neo4j/examples/TerminateTransactionsDocTest.java b/manual/embedded-examples/src/test/java/org/neo4j/examples/TerminateTransactionsDocTest.java
index 241d6b97dc989..695e2a1870b76 100644
--- a/manual/embedded-examples/src/test/java/org/neo4j/examples/TerminateTransactionsDocTest.java
+++ b/manual/embedded-examples/src/test/java/org/neo4j/examples/TerminateTransactionsDocTest.java
@@ -23,7 +23,7 @@
import org.junit.BeforeClass;
import org.junit.Test;
-import org.neo4j.test.JavaDocsGenerator;
+import org.neo4j.doc.tools.JavaDocsGenerator;
import static org.neo4j.visualization.asciidoc.AsciidocHelper.createOutputSnippet;
diff --git a/manual/embedded-examples/src/test/java/org/neo4j/examples/orderedpath/OrderedPathDocTest.java b/manual/embedded-examples/src/test/java/org/neo4j/examples/orderedpath/OrderedPathDocTest.java
index c5f1fd9a7988b..fe63f8ddf5b34 100644
--- a/manual/embedded-examples/src/test/java/org/neo4j/examples/orderedpath/OrderedPathDocTest.java
+++ b/manual/embedded-examples/src/test/java/org/neo4j/examples/orderedpath/OrderedPathDocTest.java
@@ -24,12 +24,12 @@
import java.io.IOException;
+import org.neo4j.doc.tools.JavaDocsGenerator;
import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.Transaction;
import org.neo4j.graphdb.traversal.TraversalDescription;
import org.neo4j.io.fs.FileUtils;
-import org.neo4j.test.JavaDocsGenerator;
import org.neo4j.test.TestGraphDatabaseFactory;
import org.neo4j.visualization.asciidoc.AsciidocHelper;
diff --git a/manual/server-examples/pom.xml b/manual/server-examples/pom.xml
index 86c486a648225..519fe09b748fa 100644
--- a/manual/server-examples/pom.xml
+++ b/manual/server-examples/pom.xml
@@ -108,6 +108,15 @@
jackson-mapper-asl
1.9.7
+
+
+ org.neo4j.doc
+ neo4j-doc-tools
+ ${project.version}
+ test
+ test-jar
+
+
diff --git a/pom.xml b/pom.xml
index 4eb76c5d77e82..92caba0738500 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,7 @@
integrationtests
stresstests
tools
+ doctools