Merge branch '3.1' into 3.2

neo4j · Jan 16, 2017 · 786bf6c · 786bf6c
2 parents e2df563 + 6e785bc
commit 786bf6c
Showing 1 changed file with 1 addition and 13 deletions.
diff --git a/packaging/pom.xml b/packaging/pom.xml
@@ -29,6 +29,7 @@
   </scm>
 
   <modules>
+    <module>neo4j-desktop</module>
     <module>standalone</module>
   </modules>
 
@@ -53,19 +54,6 @@ terms of the relevant Commercial Agreement.
   </licenses>
 
   <profiles>
-    <!-- Only include desktop installer in full build -->
-    <profile>
-      <id>neo-full-build</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-        <property>
-          <name>fullBuild</name>
-        </property>
-      </activation>
-      <modules>
-        <module>neo4j-desktop</module>
-      </modules>
-    </profile>
     <profile>
       <id>freeze</id>
       <activation>