Re-arranged the build so that the parts that have been extracted to plugins are built properly even when running directly in the "distribution" folder rather than at the top-level of the gcp tree.

Author: ianroberts

plugins/arc-input/pom.xml renamed to distribution/plugins/arc-input/pom.xml

@@ -16,6 +16,11 @@
   threads on a single machine.
   </description>
 
+  <modules>
+    <module>plugins/arc-input</module>
+    <module>plugins/mimir-output</module>
+  </modules>
+
   <build>
     <plugins>
       <plugin>
@@ -53,6 +58,12 @@
       <version>1.2.3</version>
     </dependency>
 
+    <dependency>
+      <groupId>uk.ac.gate</groupId>
+      <artifactId>gcp-cli</artifactId>
+      <version>3.3-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <distributionManagement>

plugins/arc-input/src/assembly/creole.xml renamed to distribution/plugins/arc-input/src/assembly/creole.xml

@@ -36,26 +36,17 @@
       <useProjectArtifact>false</useProjectArtifact>
       <unpack>false</unpack>
     </dependencySet>
+    <dependencySet>
+      <scope>provided</scope>
+      <outputDirectory></outputDirectory>
+      <useProjectArtifact>false</useProjectArtifact>
+      <unpack>false</unpack>
+      <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+    </dependencySet>
   </dependencySets>
 
   <moduleSets>
     <moduleSet>
-      <useAllReactorProjects>true</useAllReactorProjects>
-      <includes>
-        <include>uk.ac.gate:gcp-cli</include>
-      </includes>
-      <binaries>
-        <outputDirectory></outputDirectory>
-        <unpack>false</unpack>
-        <includeDependencies>false</includeDependencies>
-        <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
-      </binaries>
-    </moduleSet>
-    <moduleSet>
-      <useAllReactorProjects>true</useAllReactorProjects>
-      <includes>
-        <include>uk.ac.gate:gcp-plugin-*</include>
-      </includes>
       <binaries>
         <attachmentClassifier>distro</attachmentClassifier>
         <includeDependencies>false</includeDependencies>

plugins/arc-input/src/assembly/distro.xml renamed to distribution/plugins/arc-input/src/assembly/distro.xml

@@ -60,8 +60,6 @@
   <modules>
     <module>api</module>
     <module>impl</module>
-    <module>plugins/arc-input</module>
-    <module>plugins/mimir-output</module>
     <module>cli</module>
     <module>distribution</module>
   </modules>