| [Arakhnę-Dev] [231] * Finalization of the Maven 3 support. |
[ Thread Index |
Date Index
| More arakhne.org/dev Archives
]
Revision: 231
Author: galland
Date: 2011-08-05 16:24:44 +0200 (Fri, 05 Aug 2011)
Log Message:
-----------
* Finalization of the Maven 3 support.
Modified Paths:
--------------
trunk/arakhneVmutils/bin.xml
trunk/arakhneVmutils/java/pom.xml
trunk/arakhneVmutils/native/pom.xml
trunk/arakhneVmutils/pom.xml
trunk/pom.xml
Added Paths:
-----------
trunk/arakhneVmutils/java/
trunk/arakhneVmutils/native/
Removed Paths:
-------------
trunk/arakhneVmutils-java/
trunk/arakhneVmutils-native/
Modified: trunk/arakhneVmutils/bin.xml
===================================================================
--- trunk/arakhneVmutils/bin.xml 2011-08-05 13:56:08 UTC (rev 230)
+++ trunk/arakhneVmutils/bin.xml 2011-08-05 14:24:44 UTC (rev 231)
@@ -1,44 +1,43 @@
-<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>full</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <includeSiteDirectory>false</includeSiteDirectory>
- <dependencySets>
- <dependencySet>
- <excludes>
- <exclude>org.arakhne.afc:josuuid-*</exclude>
- </excludes>
- <outputDirectory></outputDirectory>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <unpack>true</unpack>
- <scope>runtime</scope>
- </dependencySet>
- </dependencySets>
- <files>
- <file>
- <source>../arakhneVmutils-native/josuuid/linux32/target/josuuid-linux32.so</source>
- <outputDirectory>org/arakhne/vmutil</outputDirectory>
- <destName>libjosuuid32.so</destName>
- </file>
- <file>
- <source>../arakhneVmutils-native/josuuid/linux64/target/josuuid-linux64.so</source>
- <outputDirectory>org/arakhne/vmutil</outputDirectory>
- <destName>libjosuuid64.so</destName>
- </file>
- <file>
- <source>../arakhneVmutils-native/josuuid/mingw32/target/josuuid-mingw32.dll</source>
- <outputDirectory>org/arakhne/vmutil</outputDirectory>
- <destName>josuuid32.dll</destName>
- </file>
- <file>
- <source>../arakhneVmutils-native/josuuid/mingw32/target/josuuid-mingw64.dll</source>
- <outputDirectory>org/arakhne/vmutil</outputDirectory>
- <destName>josuuid64.dll</destName>
- </file>
- </files>
+<assembly>
+ <id>bin-with-native</id>
+ <formats>
+ <format>dir</format>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <moduleSets>
+ <moduleSet>
+ <includeSubModules>false</includeSubModules>
+ <includes>
+ <include>org.arakhne.afc:arakhneVmutils-java</include>
+ </includes>
+ <binaries>
+ <outputDirectory></outputDirectory>
+ <unpack>true</unpack>
+ <includeDependencies>false</includeDependencies>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+ <files>
+ <file>
+ <source>native/josuuid/linux32/target/josuuid-linux32.so</source>
+ <outputDirectory>org/arakhne/vmutil</outputDirectory>
+ <destName>libjosuuid32.so</destName>
+ </file>
+ <file>
+ <source>native/josuuid/linux64/target/josuuid-linux64.so</source>
+ <outputDirectory>org/arakhne/vmutil</outputDirectory>
+ <destName>libjosuuid64.so</destName>
+ </file>
+ <file>
+ <source>native/josuuid/mingw32/target/josuuid-mingw32.dll</source>
+ <outputDirectory>org/arakhne/vmutil</outputDirectory>
+ <destName>josuuid32.dll</destName>
+ </file>
+ <file>
+ <source>native/josuuid/mingw64/target/josuuid-mingw64.dll</source>
+ <outputDirectory>org/arakhne/vmutil</outputDirectory>
+ <destName>josuuid64.dll</destName>
+ </file>
+ </files>
</assembly>
Modified: trunk/arakhneVmutils/java/pom.xml
===================================================================
--- trunk/arakhneVmutils-java/pom.xml 2011-08-05 13:56:08 UTC (rev 230)
+++ trunk/arakhneVmutils/java/pom.xml 2011-08-05 14:24:44 UTC (rev 231)
@@ -12,6 +12,7 @@
<artifactId>afc</artifactId>
<groupId>org.arakhne.afc</groupId>
<version>4.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>arakhneVmutils-java</artifactId>
@@ -19,6 +20,7 @@
<groupId>org.arakhne.afc</groupId>
<version>6.1-SNAPSHOT</version>
<name>${project.artifactId}</name>
+ <url>http://www.arakhne.org/arakhneVmutils/</url>
<properties>
<manifest.file>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifest.file>
Modified: trunk/arakhneVmutils/native/pom.xml
===================================================================
--- trunk/arakhneVmutils-native/pom.xml 2011-08-05 13:56:08 UTC (rev 230)
+++ trunk/arakhneVmutils/native/pom.xml 2011-08-05 14:24:44 UTC (rev 231)
@@ -11,6 +11,7 @@
<artifactId>afc</artifactId>
<groupId>org.arakhne.afc</groupId>
<version>4.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>arakhneVmutils-native</artifactId>
@@ -18,6 +19,7 @@
<packaging>pom</packaging>
<version>6.1-SNAPSHOT</version>
<name>${project.artifactId}</name>
+ <url>http://www.arakhne.org/arakhneVmutils/</url>
<!-- ======================================= -->
<!-- ==== Project Information === -->
Modified: trunk/arakhneVmutils/pom.xml
===================================================================
--- trunk/arakhneVmutils/pom.xml 2011-08-05 13:56:08 UTC (rev 230)
+++ trunk/arakhneVmutils/pom.xml 2011-08-05 14:24:44 UTC (rev 231)
@@ -17,50 +17,33 @@
<description>Additional tools dedicated to low-level and virtual machine features</description>
<url>http://www.arakhne.org/arakhneVmutils/</url>
+ <properties>
+ <manifest.file>java/target/classes/META-INF/MANIFEST.MF</manifest.file>
+ </properties>
+
+ <modules>
+ <module>java</module>
+ <module>native</module>
+ </modules>
+
<!-- ======================================= -->
<!-- ==== Project Information === -->
<!-- ======================================= -->
- <dependencies>
- <dependency>
- <groupId>org.arakhne.afc</groupId>
- <artifactId>arakhneVmutils-java</artifactId>
- </dependency>
- <dependency>
- <groupId>org.arakhne.afc</groupId>
- <artifactId>josuuid-linux32</artifactId>
- <version>6.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.arakhne.afc</groupId>
- <artifactId>josuuid-linux64</artifactId>
- <version>6.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.arakhne.afc</groupId>
- <artifactId>josuuid-mingw32</artifactId>
- <version>6.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.arakhne.afc</groupId>
- <artifactId>josuuid-mingw64</artifactId>
- <version>6.1-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
+ <appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>bin.xml</descriptor>
</descriptors>
- <!-- archive>
+ <archive>
<index>false</index>
- <manifestFile>${project.build.directory}/${project.artifactId}-${project.version}/META-INF/MANIFEST.MF</manifestFile>
- </archive -->
+ <manifestFile>${manifest.file}</manifestFile>
+ </archive>
</configuration>
<executions>
<execution>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-08-05 13:56:08 UTC (rev 230)
+++ trunk/pom.xml 2011-08-05 14:24:44 UTC (rev 231)
@@ -130,8 +130,6 @@
<module>javadoc-tag-replacer</module>
<module>license-installer</module>
<module>arakhneRefs</module>
- <module>arakhneVmutils-java</module>
- <module>arakhneVmutils-native</module>
<module>arakhneVmutils</module>
<module>arakhneLogger</module>
<module>arakhneLog4J</module>