Move doctools into manual project

neo4j · Oct 26, 2016 · 014eda8 · 014eda8
1 parent e600d6c
commit 014eda8
Show file tree

Hide file tree

Showing 18 changed files with 2 additions and 20 deletions.
diff --git a/community/server/pom.xml b/community/server/pom.xml
@@ -329,15 +329,6 @@
       <version>20090211</version>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.neo4j.doc</groupId>
-      <artifactId>neo4j-doc-tools</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-      <type>test-jar</type>
-    </dependency>
-
   </dependencies>
 
   <build>

diff --git a/enterprise/server-enterprise/pom.xml b/enterprise/server-enterprise/pom.xml
@@ -157,15 +157,6 @@
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.neo4j.doc</groupId>
-      <artifactId>neo4j-doc-tools</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-      <type>test-jar</type>
-    </dependency>
-
   </dependencies>
 
   <build>

diff --git a/doctools/LICENSES.txt → manual/doctools/LICENSES.txt b/doctools/LICENSES.txt → manual/doctools/LICENSES.txt
diff --git a/doctools/NOTICE.txt → manual/doctools/NOTICE.txt b/doctools/NOTICE.txt → manual/doctools/NOTICE.txt
diff --git a/doctools/pom.xml → manual/doctools/pom.xml b/doctools/pom.xml → manual/doctools/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>parent</artifactId>
         <groupId>org.neo4j</groupId>
         <version>3.0.7-SNAPSHOT</version>
-        <relativePath>..</relativePath>
+        <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/.../org/neo4j/doc/AsciiDocListGenerator.java → .../org/neo4j/doc/AsciiDocListGenerator.java b/.../org/neo4j/doc/AsciiDocListGenerator.java → .../org/neo4j/doc/AsciiDocListGenerator.java
diff --git a/...eo4j/doc/GenerateConfigDocumentation.java → ...eo4j/doc/GenerateConfigDocumentation.java b/...eo4j/doc/GenerateConfigDocumentation.java → ...eo4j/doc/GenerateConfigDocumentation.java
diff --git a/...ava/org/neo4j/doc/SettingDescription.java → ...ava/org/neo4j/doc/SettingDescription.java b/...ava/org/neo4j/doc/SettingDescription.java → ...ava/org/neo4j/doc/SettingDescription.java
diff --git a/...va/org/neo4j/doc/SettingsDescription.java → ...va/org/neo4j/doc/SettingsDescription.java b/...va/org/neo4j/doc/SettingsDescription.java → ...va/org/neo4j/doc/SettingsDescription.java
diff --git a/...ava/org/neo4j/doc/SettingsDocumenter.java → ...ava/org/neo4j/doc/SettingsDocumenter.java b/...ava/org/neo4j/doc/SettingsDocumenter.java → ...ava/org/neo4j/doc/SettingsDocumenter.java
diff --git a/...org/neo4j/doc/SettingsDocumenterTest.java → ...org/neo4j/doc/SettingsDocumenterTest.java b/...org/neo4j/doc/SettingsDocumenterTest.java → ...org/neo4j/doc/SettingsDocumenterTest.java
diff --git a/...j/doc/metatest/AsciiDocGeneratorTest.java → ...j/doc/metatest/AsciiDocGeneratorTest.java b/...j/doc/metatest/AsciiDocGeneratorTest.java → ...j/doc/metatest/AsciiDocGeneratorTest.java
diff --git a/...c/metatest/TestJavaTestDocsGenerator.java → ...c/metatest/TestJavaTestDocsGenerator.java b/...c/metatest/TestJavaTestDocsGenerator.java → ...c/metatest/TestJavaTestDocsGenerator.java
diff --git a/...rg/neo4j/doc/tools/AsciiDocGenerator.java → ...rg/neo4j/doc/tools/AsciiDocGenerator.java b/...rg/neo4j/doc/tools/AsciiDocGenerator.java → ...rg/neo4j/doc/tools/AsciiDocGenerator.java
diff --git a/...rg/neo4j/doc/tools/JavaDocsGenerator.java → ...rg/neo4j/doc/tools/JavaDocsGenerator.java b/...rg/neo4j/doc/tools/JavaDocsGenerator.java → ...rg/neo4j/doc/tools/JavaDocsGenerator.java
diff --git a/...eo4j/doc/tools/JavaTestDocsGenerator.java → ...eo4j/doc/tools/JavaTestDocsGenerator.java b/...eo4j/doc/tools/JavaTestDocsGenerator.java → ...eo4j/doc/tools/JavaTestDocsGenerator.java
diff --git a/manual/pom.xml b/manual/pom.xml
@@ -37,6 +37,7 @@
     <module>backup</module>
     <module>ha-docs</module>
     <module>metrics-docs</module>
+    <module>doctools</module>
   </modules>
 
   <scm>

diff --git a/pom.xml b/pom.xml
@@ -45,7 +45,6 @@
     <module>integrationtests</module>
     <module>stresstests</module>
     <module>tools</module>
-    <module>doctools</module>
   </modules>
 
   <build>