[Joafip-svn] SF.net SVN: joafip:[3104] trunk
Brought to you by:
luc_peuvrier
Menu
▾
▴
[Joafip-svn] SF.net SVN: joafip:[3104] trunk
|
From: <luc...@us...> - 2012-06-03 07:06:16
|
Revision: 3104
http://joafip.svn.sourceforge.net/joafip/?rev=3104&view=rev
Author: luc_peuvrier
Date: 2012-06-03 07:06:09 +0000 (Sun, 03 Jun 2012)
Log Message:
-----------
mavenization upgrade
Modified Paths:
--------------
trunk/joafip/doc/_todo.txt
trunk/joafip/pom.xml
trunk/joafip-4test/pom.xml
trunk/joafip-heapfile/pom.xml
trunk/joafip-kvstore/pom.xml
trunk/joafip-parent/LICENSE.txt
trunk/joafip-parent/pom.xml
Added Paths:
-----------
trunk/joafip-parent/dist.bat
trunk/joafip-parent/src/
trunk/joafip-parent/src/assemble/
trunk/joafip-parent/src/assemble/bin-dist.xml
trunk/joafip-parent/src/assemble/src-dist.xml
Removed Paths:
-------------
trunk/joafip/src/mtest/
trunk/joafip/src/testsuite/
trunk/joafip/src/tools/
Modified: trunk/joafip/doc/_todo.txt
===================================================================
--- trunk/joafip/doc/_todo.txt 2012-06-01 18:18:06 UTC (rev 3103)
+++ trunk/joafip/doc/_todo.txt 2012-06-03 07:06:09 UTC (rev 3104)
@@ -839,6 +839,11 @@
JPA
--------------------------------------------------------------------------------
+jmvanel start something ....
+http://www.jpab.org/Home.html
+http://www.objectdb.com/
+Copyright © 2010-2012 ObjectDB Software
+
--------------------------------------------------------------------------------
JDO
--------------------------------------------------------------------------------
Modified: trunk/joafip/pom.xml
===================================================================
--- trunk/joafip/pom.xml 2012-06-01 18:18:06 UTC (rev 3103)
+++ trunk/joafip/pom.xml 2012-06-03 07:06:09 UTC (rev 3104)
@@ -4,13 +4,12 @@
<parent>
<groupId>net.sf.joafip</groupId>
<artifactId>joafip-parent</artifactId>
- <version>1.0.0</version>
+ <version>4.0.0b8</version>
<relativePath>../joafip-parent</relativePath>
</parent>
<!-- <groupId>net.sf.joafip</groupId> -->
<artifactId>joafip</artifactId>
<packaging>jar</packaging>
- <version>4.0.0b8</version>
<url>http://joafip.sourceforge.net/</url>
<name>Joafip core</name>
@@ -22,19 +21,16 @@
<dependency>
<groupId>net.sf.joafip</groupId>
<artifactId>joafip-asm</artifactId>
- <version>4.0.0b8</version>
</dependency>
<dependency>
<groupId>net.sf.joafip</groupId>
<artifactId>joafip-common</artifactId>
- <version>4.0.0b8</version>
</dependency>
<dependency>
<groupId>net.sf.joafip</groupId>
<artifactId>joafip-common</artifactId>
- <version>4.0.0b8</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -42,25 +38,21 @@
<dependency>
<groupId>net.sf.joafip</groupId>
<artifactId>joafip-collection</artifactId>
- <version>4.0.0b8</version>
</dependency>
<dependency>
<groupId>net.sf.joafip</groupId>
<artifactId>joafip-kvstore</artifactId>
- <version>4.0.0b8</version>
</dependency>
<dependency>
<groupId>net.sf.joafip</groupId>
<artifactId>joafip-heapfile</artifactId>
- <version>4.0.0b8</version>
</dependency>
<dependency>
<groupId>net.sf.joafip</groupId>
<artifactId>joafip-heapfile</artifactId>
- <version>4.0.0b8</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -68,14 +60,12 @@
<dependency>
<groupId>net.sf.joafip</groupId>
<artifactId>joafip-rbtree</artifactId>
- <version>4.0.0b8</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.sf.joafip</groupId>
<artifactId>joafip-rbtree</artifactId>
- <version>4.0.0b8</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -83,13 +73,11 @@
<dependency>
<groupId>net.sf.joafip</groupId>
<artifactId>joafip-file</artifactId>
- <version>4.0.0b8</version>
</dependency>
<dependency>
<groupId>net.sf.joafip</groupId>
<artifactId>joafip-file</artifactId>
- <version>4.0.0b8</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -97,27 +85,24 @@
<dependency>
<groupId>net.sf.joafip</groupId>
<artifactId>joafip-callback</artifactId>
- <version>4.0.0b8</version>
</dependency>
<dependency>
<groupId>net.sf.joafip</groupId>
<artifactId>joafip-meminspector</artifactId>
- <version>4.0.0b8</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>gnu.trove</groupId>
- <artifactId>trove</artifactId>
- <version>2.0.4</version>
+ <groupId>net.sf.joafip</groupId>
+ <artifactId>joafip-log4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.sf.joafip</groupId>
- <artifactId>joafip-log4j</artifactId>
- <version>4.0.0b8</version>
+ <groupId>gnu.trove</groupId>
+ <artifactId>trove</artifactId>
+ <version>2.0.4</version>
<scope>test</scope>
</dependency>
Modified: trunk/joafip-4test/pom.xml
===================================================================
--- trunk/joafip-4test/pom.xml 2012-06-01 18:18:06 UTC (rev 3103)
+++ trunk/joafip-4test/pom.xml 2012-06-03 07:06:09 UTC (rev 3104)
@@ -7,7 +7,6 @@
<version>4.0.0b8</version>
<relativePath>../joafip-parent</relativePath>
</parent>
- <!-- <groupId>net.sf.joafip</groupId> -->
<artifactId>joafip-4test</artifactId>
<packaging>jar</packaging>
<url>http://joafip.sourceforge.net/</url>
Modified: trunk/joafip-heapfile/pom.xml
===================================================================
--- trunk/joafip-heapfile/pom.xml 2012-06-01 18:18:06 UTC (rev 3103)
+++ trunk/joafip-heapfile/pom.xml 2012-06-03 07:06:09 UTC (rev 3104)
@@ -44,6 +44,11 @@
<dependency>
<groupId>net.sf.joafip</groupId>
+ <artifactId>joafip-rbtree</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.joafip</groupId>
<artifactId>joafip-file</artifactId>
</dependency>
Modified: trunk/joafip-kvstore/pom.xml
===================================================================
--- trunk/joafip-kvstore/pom.xml 2012-06-01 18:18:06 UTC (rev 3103)
+++ trunk/joafip-kvstore/pom.xml 2012-06-03 07:06:09 UTC (rev 3104)
@@ -33,6 +33,7 @@
<dependency>
<groupId>net.sf.joafip</groupId>
<artifactId>joafip-rbtree</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
Modified: trunk/joafip-parent/LICENSE.txt
===================================================================
--- trunk/joafip-parent/LICENSE.txt 2012-06-01 18:18:06 UTC (rev 3103)
+++ trunk/joafip-parent/LICENSE.txt 2012-06-03 07:06:09 UTC (rev 3104)
@@ -1,6 +1,6 @@
LICENSE.txt JOAFIP project license
-Copyright 2011 Luc Peuvrier
+Copyright 2017-2012 Luc Peuvrier
JOAFIP is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License.
Added: trunk/joafip-parent/dist.bat
===================================================================
--- trunk/joafip-parent/dist.bat (rev 0)
+++ trunk/joafip-parent/dist.bat 2012-06-03 07:06:09 UTC (rev 3104)
@@ -0,0 +1,4 @@
+@echo off
+@rem create distribution
+call mvn package assembly:assembly
+pause
\ No newline at end of file
Modified: trunk/joafip-parent/pom.xml
===================================================================
--- trunk/joafip-parent/pom.xml 2012-06-01 18:18:06 UTC (rev 3103)
+++ trunk/joafip-parent/pom.xml 2012-06-03 07:06:09 UTC (rev 3104)
@@ -318,6 +318,34 @@
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assemble/bin-dist.xml</descriptor>
+ <descriptor>src/assemble/src-dist.xml</descriptor>
+ </descriptors>
+ <finalName>joafip-${joafip.version}</finalName>
+ <executions>
+ <execution>
+ <id>bin-dist</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>src-dist</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </configuration>
+ </plugin>
</plugins>
</build>
Added: trunk/joafip-parent/src/assemble/bin-dist.xml
===================================================================
--- trunk/joafip-parent/src/assemble/bin-dist.xml (rev 0)
+++ trunk/joafip-parent/src/assemble/bin-dist.xml 2012-06-03 07:06:09 UTC (rev 3104)
@@ -0,0 +1,35 @@
+<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>bin-dist</id>
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</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>org.test:child1</include> </includes> -->
+ <binaries>
+ <!-- <outputDirectory>modules/${artifactId}</outputDirectory> -->
+ <outputDirectory>/</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+ <fileSets>
+ <fileSet>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>README*</include>
+ <include>NOTICE*</include>
+ <include>LICENSE*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Added: trunk/joafip-parent/src/assemble/src-dist.xml
===================================================================
--- trunk/joafip-parent/src/assemble/src-dist.xml (rev 0)
+++ trunk/joafip-parent/src/assemble/src-dist.xml 2012-06-03 07:06:09 UTC (rev 3104)
@@ -0,0 +1,36 @@
+<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>src-dist</id>
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <moduleSets>
+ <moduleSet>
+ <sources>
+ <excludeSubModuleDirectories>false</excludeSubModuleDirectories>
+ <fileSets>
+ <fileSet>
+ <directory>src</directory>
+ <excludes>
+ <exclude>target/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+ </sources>
+ </moduleSet>
+ </moduleSets>
+<!-- <fileSets>
+ <fileSet>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>README*</include>
+ <include>NOTICE*</include>
+ <include>LICENSE*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ --></assembly>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
