S-11: Create maven assembly for Sodalis

wladimiiir · Dec 1, 2014 · 1a7b2c2 · 1a7b2c2
1 parent 4710d40
commit 1a7b2c2
Show file tree

Hide file tree

Showing 11 changed files with 116 additions and 18 deletions.
diff --git a/app/pom.xml b/app/pom.xml
@@ -46,22 +46,38 @@
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>2.4</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>sk.magiksoft.sodalis.app.Launcher</mainClass>
-                        </manifest>
-                    </archive>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                    <outputDirectory>${project.build.directory}</outputDirectory>
-                    <finalName>sodalis.jar</finalName>
-                </configuration>
                 <executions>
                     <execution>
-                        <id>make-assembly</id>
+                        <id>make-jar</id>
                         <phase>package</phase>
+                        <configuration>
+                            <archive>
+                                <manifest>
+                                    <mainClass>sk.magiksoft.sodalis.app.Launcher</mainClass>
+                                </manifest>
+                            </archive>
+                            <descriptorRefs>
+                                <descriptorRef>jar-with-dependencies</descriptorRef>
+                            </descriptorRefs>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                            <finalName>sodalis</finalName>
+                            <appendAssemblyId>false</appendAssemblyId>
+                        </configuration>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>make-package</id>
+                        <phase>package</phase>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>${basedir}/../dev/assembly.xml</descriptor>
+                            </descriptors>
+                            <finalName>sodalis</finalName>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <outputDirectory>${basedir}/../build</outputDirectory>
+                        </configuration>
                         <goals>
                             <goal>single</goal>
                         </goals>

diff --git a/core/pom.xml b/core/pom.xml
@@ -98,9 +98,7 @@
         <dependency>
             <groupId>net.sf.vcard4j</groupId>
             <artifactId>vcard4j</artifactId>
-            <scope>system</scope>
             <version>1.0</version>
-            <systemPath>${lib.path}/vcard4j.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>

diff --git a/dev/assembly.xml b/dev/assembly.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>sodalis</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>true</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>${project.basedir}/../config</directory>
+            <outputDirectory>/config</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>${project.basedir}/..</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>hibernate-mapping-3.0.dtd</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.basedir}/../data</directory>
+            <outputDirectory>/data</outputDirectory>
+            <excludes>
+                <exclude>cache/**</exclude>
+                <exclude>config/**</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>sodalis.jar</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/form/pom.xml b/form/pom.xml
@@ -22,9 +22,7 @@
         <dependency>
             <groupId>org.jhotdraw</groupId>
             <artifactId>jhotdraw</artifactId>
-            <scope>system</scope>
             <version>7.6</version>
-            <systemPath>${lib.path}/jhotdraw.jar</systemPath>
         </dependency>
     </dependencies>
 </project>
diff --git a/lib/vcard4j.jar → ...et/sf/vcard4j/vcard4j/1.0/vcard4j-1.0.jar b/lib/vcard4j.jar → ...et/sf/vcard4j/vcard4j/1.0/vcard4j-1.0.jar
diff --git a/lib/net/sf/vcard4j/vcard4j/1.0/vcard4j-1.0.pom b/lib/net/sf/vcard4j/vcard4j/1.0/vcard4j-1.0.pom
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>net.sf.vcard4j</groupId>
+  <artifactId>vcard4j</artifactId>
+  <version>1.0</version>
+  <description>POM was created from install:install-file</description>
+</project>
diff --git a/lib/net/sf/vcard4j/vcard4j/maven-metadata-local.xml b/lib/net/sf/vcard4j/vcard4j/maven-metadata-local.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>net.sf.vcard4j</groupId>
+  <artifactId>vcard4j</artifactId>
+  <versioning>
+    <release>1.0</release>
+    <versions>
+      <version>1.0</version>
+    </versions>
+    <lastUpdated>20141201125223</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/lib/jhotdraw.jar → ...rg/jhotdraw/jhotdraw/7.6/jhotdraw-7.6.jar b/lib/jhotdraw.jar → ...rg/jhotdraw/jhotdraw/7.6/jhotdraw-7.6.jar
diff --git a/lib/org/jhotdraw/jhotdraw/7.6/jhotdraw-7.6.pom b/lib/org/jhotdraw/jhotdraw/7.6/jhotdraw-7.6.pom
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.jhotdraw</groupId>
+  <artifactId>jhotdraw</artifactId>
+  <version>7.6</version>
+  <description>POM was created from install:install-file</description>
+</project>
diff --git a/lib/org/jhotdraw/jhotdraw/maven-metadata-local.xml b/lib/org/jhotdraw/jhotdraw/maven-metadata-local.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.jhotdraw</groupId>
+  <artifactId>jhotdraw</artifactId>
+  <versioning>
+    <release>7.6</release>
+    <versions>
+      <version>7.6</version>
+    </versions>
+    <lastUpdated>20141201124838</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/pom.xml b/pom.xml
@@ -12,9 +12,15 @@
 
     <properties>
         <scala.version>2.11.4</scala.version>
-        <lib.path>${basedir}/../lib</lib.path>
     </properties>
 
+    <repositories>
+        <repository>
+            <id>libs</id>
+            <url>file://${basedir}/../lib</url>
+        </repository>
+    </repositories>
+
     <build>
         <plugins>
             <plugin>