resolving package dependencies

olir · Apr 5, 2018 · 7e69f99 · 7e69f99
1 parent ec417fe
commit 7e69f99
Show file tree

Hide file tree

Showing 11 changed files with 116 additions and 331 deletions.
diff --git a/plugin-jogamp/native/pom.xml b/plugin-jogamp/native/pom.xml
@@ -18,6 +18,7 @@
 
 	<!-- Check activations with: mvn help:system |grep os -->
    <profiles>
+   <!--
     <profile>
       <id>win32</id>
       <activation>
@@ -30,6 +31,7 @@
         <module>win32</module>
       </modules>
     </profile>
+    -->
 
     <profile>
       <id>win64</id>

diff --git a/plugin-jogamp/native/win32/pom.xml b/plugin-jogamp/native/win32/pom.xml
diff --git a/plugin-jogamp/native/win64/pom.xml b/plugin-jogamp/native/win64/pom.xml
@@ -98,7 +98,7 @@
 				  </execution>
 				  <execution>
 					<id>copy</id>
-					<phase>package</phase>
+					<phase>prepare-package</phase>
 					<goals>
 					  <goal>run</goal>
 					</goals>

diff --git a/plugin-jogamp/pom.xml b/plugin-jogamp/pom.xml
@@ -22,16 +22,8 @@
    </modules>
 
   <build>
-
-	<pluginManagement>
-	  <plugins>
-		<plugin>
-		  <groupId>org.codehaus.mojo</groupId>
-		  <artifactId>native-maven-plugin</artifactId>
-		  <version>1.0-alpha-8</version>
-		</plugin>
-	  </plugins>
-	</pluginManagement>
+    <plugins>
+    </plugins>
 
   </build>
 

diff --git a/plugin-opencv/distribution/pom.xml b/plugin-opencv/distribution/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>de.serviceflow.frankenstein.plugin.opencv</groupId>
+    <artifactId>plugin-parent</artifactId>
+    <version>0.3.4-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>distribution</artifactId>
+
+  <packaging>pom</packaging>
+
+  <name>Distribution</name>
+
+  <!-- NOTE: These dependency declarations are only required to sort this project to the 
+       end of the line in the multimodule build. 
+       
+       Since we only include the child1 module in our assembly, we only need to ensure this
+       distribution project builds AFTER that one...
+  -->
+  <dependencies>
+    <dependency>
+      <groupId>de.serviceflow.frankenstein.plugin.opencv</groupId>
+      <artifactId>plugin-opencv</artifactId>
+      <version>0.3.4-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>de.serviceflow.frankenstein.plugin.opencv</groupId>
+      <artifactId>plugin-opencv-64</artifactId>
+      <version>0.3.4-SNAPSHOT</version>
+      <type>dll</type>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>3.1.0</version>
+        <executions>
+          <execution>
+            <id>distro-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>src/assembly/bin.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/plugin-opencv/distribution/src/assembly/bin.xml b/plugin-opencv/distribution/src/assembly/bin.xml
@@ -0,0 +1,26 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+  <id>bin</id>
+  <formats>
+    <format>dir</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <moduleSets>
+    <moduleSet>
+
+      <!-- Enable access to all projects in the current multimodule build! -->
+      <useAllReactorProjects>true</useAllReactorProjects>
+
+      <!-- Now, select which projects to include in this module-set. -->
+      <includes>
+        <include>de.serviceflow.frankenstein.plugin.opencv:plugin-opencv</include>
+        <include>de.serviceflow.frankenstein.plugin.opencv:plugin-opencv-64</include>
+      </includes>
+      <binaries>
+        <outputDirectory>modules/maven-assembly-plugin</outputDirectory>
+        <unpack>false</unpack>
+      </binaries>
+    </moduleSet>
+  </moduleSets>
+</assembly>
diff --git a/plugin-opencv/java/pom.xml b/plugin-opencv/java/pom.xml
@@ -147,9 +147,7 @@
           <goal>jar</goal>
             </goals>
             <configuration>
-            <outputDirectory>
-              ${project.basedir}/target/jws
-            </outputDirectory>
+            <outputDirectory>${project.basedir}/target/jws</outputDirectory>
           </configuration>
         </execution>
           </executions>

diff --git a/plugin-opencv/native/pom.xml b/plugin-opencv/native/pom.xml
@@ -18,6 +18,7 @@
 
 	<!-- Check activations with: mvn help:system |grep os -->
    <profiles>
+    <!--
     <profile>
       <id>win32</id>
       <activation>
@@ -30,7 +31,7 @@
         <module>win32</module>
       </modules>
     </profile>
-	
+    -->
     <profile>
       <id>win64</id>
       <activation>