Merge remote-tracking branch 'upstream/2.1-maint'

stevexyz · Sep 23, 2014 · 099f470 · 099f470
2 parents 2f6473e + f5f8c5a
commit 099f470
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 36 deletions.
diff --git a/manual/pom.xml b/manual/pom.xml
@@ -20,6 +20,7 @@
     <short-name>manual</short-name>
     <docs.sources>${project.build.directory}/docs</docs.sources>
     <docs.javadocs>${project.build.directory}/javadoc</docs.javadocs>
+    <docs.refcard>${project.build.directory}/refcard</docs.refcard>
     <docs.sourcecode>${project.build.directory}/sources</docs.sourcecode>
     <docs.test-sources>${project.build.directory}/test-sources</docs.test-sources>
     <docs.images>${project.build.outputDirectory}/images</docs.images>
@@ -31,6 +32,7 @@
 
   <modules>
     <module>javadocs</module>
+    <module>refcard</module>
   </modules>
 
   <scm>
@@ -201,6 +203,12 @@
       <classifier>sources</classifier>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.neo4j.doc</groupId>
+      <artifactId>neo4j-cypher-refcard</artifactId>
+      <version>${neo4j.version}</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.neo4j.build.plugins</groupId>
       <artifactId>neo4j-doctools</artifactId>
@@ -336,6 +344,22 @@
               <outputDirectory>${docs.javadocs}</outputDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>unpack-refcard</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>unpack-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeArtifactIds>neo4j-cypher-refcard</includeArtifactIds>
+              <excludeTransitive>true</excludeTransitive>
+              <useSubDirectoryPerArtifact>false</useSubDirectoryPerArtifact>
+              <stripVersion>true</stripVersion>
+              <excludes>META-INF,META-INF/**</excludes>
+              <type>jar</type>
+              <outputDirectory>${docs.refcard}</outputDirectory>
+            </configuration>
+          </execution>
           <execution>
             <id>unpack-test-sources</id>
             <phase>generate-sources</phase>
@@ -585,6 +609,9 @@
                 <copy todir="${project.build.directory}/docbkx/webhelp/javadocs" overwrite="true">
                   <fileset dir="${docs.javadocs}"/>
                 </copy>
+                <copy todir="${project.build.directory}/docbkx/webhelp/cypher-refcard" overwrite="true">
+                  <fileset dir="${docs.refcard}"/>
+                </copy>
                 <!-- source code used by the manual.
                 <copy todir="${project.build.directory}/docbkx/webhelp/code" overwrite="true">
                   <fileset dir="${docs.sourcecode}/neo4j-examples-sources-jar" />

diff --git a/manual/refcard/pom.xml b/manual/refcard/pom.xml
@@ -13,7 +13,7 @@
   <name>Neo4j Cypher Reference Card</name>
   <description>Reference Card for the Neo4j Cypher Query Language.</description>
   <url>http://components.neo4j.org/${project.artifactId}/${project.version}</url>
-  <packaging>pom</packaging>
+  <packaging>jar</packaging>
 
   <properties>
     <neo4j.version>2.2-SNAPSHOT</neo4j.version>
@@ -135,45 +135,14 @@
               </arguments>
             </configuration>
           </execution>
-          <execution>
-            <id>create-refcard-dir</id>
-            <phase>deploy</phase>
-            <goals><goal>exec</goal></goals>
-            <configuration>
-              <executable>ssh</executable>
-              <arguments>
-                <argument>-i</argument>
-                <argument>${env.HOME}/.ssh/neo_at_docs_neo4j_org</argument>
-                <argument>${docs.server}</argument>
-                <argument>mkdir</argument>
-                <argument>-p</argument>
-                <argument>${docs.rootpath}/refcard/${refcard.version}</argument>
-              </arguments>
-            </configuration>
-          </execution>
-          <execution>
-            <id>upload-refcard</id>
-            <phase>deploy</phase>
-            <goals><goal>exec</goal></goals>
-            <configuration>
-              <executable>rsync</executable>
-              <arguments>
-                <argument>-e</argument>
-                <argument>ssh -i ${env.HOME}/.ssh/neo_at_docs_neo4j_org</argument>
-                <argument>-r</argument>
-                <argument>--delete</argument>
-                <argument>${project.build.directory}/html5/</argument>
-                <argument>${docs.server}:${docs.rootpath}/refcard/${refcard.version}/</argument>
-              </arguments>
-            </configuration>
-          </execution>
         </executions>
       </plugin>
       <plugin>
         <groupId>org.neo4j.build.plugins</groupId>
         <artifactId>license-maven-plugin</artifactId>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>
@@ -184,6 +153,12 @@
             <id>attach-test-jar</id>
             <phase>none</phase>
           </execution>
+          <execution>
+            <id>default-jar</id>
+            <configuration>
+              <classesDirectory>${project.build.directory}/html5/</classesDirectory>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
     </plugins>

diff --git a/manual/src/preface/preface.asciidoc b/manual/src/preface/preface.asciidoc
@@ -31,7 +31,7 @@ Thus, the examples are always in sync with how Neo4j actually works.
 
 There's other documentation resources besides the manual as well:
 
-* Neo4j Cypher Refcard, see http://docs.neo4j.org/refcard/{neo4j-version}.
+* Neo4j Cypher Refcard, see link:cypher-refcard/[Cypher Refcard].
 * Neo4j GraphGist, an online tool for creating interactive documents with executable Cypher statements: http://gist.neo4j.org/.
 * The main Neo4j site at http://neo4j.com/ is a good starting point to learn about Neo4j.
 * For use when writing Neo4j extensions and plugins, or for embedded usage, see link:javadocs/[Neo4j Javadocs].

diff --git a/pom.xml b/pom.xml
@@ -260,7 +260,6 @@ public class ComponentVersion extends Version
       </activation>
       <modules>
         <module>manual</module>
-        <module>manual/refcard</module>
         <module>packaging</module>
         <module>packaging/installer-linux</module>
       </modules>
@@ -318,7 +317,6 @@ public class ComponentVersion extends Version
       </activation>
       <modules>
         <module>manual</module>
-        <module>manual/refcard</module>
       </modules>
       <properties>
         <attach-java-sources-phase>package</attach-java-sources-phase>