Author: tchemit Date: 2009-02-05 22:01:26 +0000 (Thu, 05 Feb 2009) New Revision: 260 Added: jrst/trunk/src/main/assembly/ jrst/trunk/src/main/assembly/deps.xml jrst/trunk/src/main/assembly/full.xml Modified: jrst/trunk/changelog.txt jrst/trunk/pom.xml Log: use lutinproject 3.4, make assembly Modified: jrst/trunk/changelog.txt =================================================================== --- jrst/trunk/changelog.txt 2009-02-05 21:58:47 UTC (rev 259) +++ jrst/trunk/changelog.txt 2009-02-05 22:01:26 UTC (rev 260) @@ -6,7 +6,7 @@ * Re add i18n plugin on build * Reenable tests during maven build * Move test to junit 4 - * switch to lutinproject 3.3 + * switch to lutinproject 3.4 ver-0.8.3 chemit 20081009 Modified: jrst/trunk/pom.xml =================================================================== --- jrst/trunk/pom.xml 2009-02-05 21:58:47 UTC (rev 259) +++ jrst/trunk/pom.xml 2009-02-05 22:01:26 UTC (rev 260) @@ -1,107 +1,22 @@ <?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/maven-v4_0_0.xsd"> +<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/maven-v4_0_0.xsd"> - <!--The version of maven's project object model--> <modelVersion>4.0.0</modelVersion> - <!-- parent --> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> + <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.3</version> + <version>3.4-SNAPSHOT</version> </parent> - <!--A unique name for this project--> <artifactId>jrst</artifactId> - <name>JRst</name> - - <!--ejb, jar, war...--> - <packaging>jar</packaging> - - <!--Version--> <version>0.8.4-SNAPSHOT</version> - <!--Description--> - <description>Parser RST en Java.</description> - <inceptionYear>2004</inceptionYear> - - <properties> - <!-- id du projet du labs --> - <labs.id>54</labs.id> - - <!-- nom du projet sur le labs --> - <labs.project>jrst</labs.project> - - <!-- Site en et fr --> - <maven.site.locales>fr,en</maven.site.locales> - </properties> - - <!--Source control management--> - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> - - <build> - <plugins> - <!-- i18n --> - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <mainClass>org.codelutin.jrst.JRST</mainClass> - <classpathPrefix>lib/</classpathPrefix> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.1</version> - <executions> - <execution> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.5</version> - <configuration> - <link>http://java.sun.com/javase/6/docs/api/index.html</link> - <link>http://topia.labs.libre-entreprise.org/apidocs/</link> - <link>http://lutinutil.labs.libre-entreprise.org/apidocs/</link> - </configuration> - </plugin> - </plugins> - </build> - - <!--Librairies--> <dependencies> <dependency> <groupId>commons-lang</groupId> @@ -112,7 +27,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> - <version>1.0.2</version> + <version>${lutinutil.version}</version> <scope>compile</scope> </dependency> <dependency> @@ -166,4 +81,178 @@ <scope>runtime</scope> </dependency> </dependencies> + + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> + + <name>JRst</name> + <description>Parser RST en Java.</description> + <inceptionYear>2004</inceptionYear> + + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> + <packaging>jar</packaging> + + <properties> + <!-- id du projet du labs --> + <labs.id>54</labs.id> + + <!-- nom du projet sur le labs --> + <labs.project>jrst</labs.project> + + <!-- Site en et fr --> + <maven.site.locales>fr,en</maven.site.locales> + </properties> + + <build> + + <defaultGoal>install</defaultGoal> + + <plugins> + + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <mainClass>org.codelutin.jrst.JRST</mainClass> + <classpathPrefix>lib/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <configuration> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + </configuration> + <executions> + <execution> + <id>copy-dependencies</id> + </execution> + </executions> + </plugin> + + <!-- Always process jrst files, but only called on pre-site phase --> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jrst-plugin</artifactId> + <version>${jrst.version}</version> + <configuration> + <directoryIn>${maven.src.dir}/site</directoryIn> + <directoryOut>${maven.site.gen.dir}</directoryOut> + <defaultLocale>fr</defaultLocale> + <inputEncoding>${maven.compile.encoding}</inputEncoding> + <outputEncoding>${maven.compile.encoding}</outputEncoding> + </configuration> + <executions> + <execution> + <phase>pre-site</phase> + <goals> + <goal>jrst</goal> + </goals> + </execution> + </executions> + </plugin> + + <!--plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.5</version> + <configuration> + <link>http://java.sun.com/javase/6/docs/api/index.html</link> + <link>http://topia.labs.libre-entreprise.org/apidocs/</link> + <link>http://lutinutil.labs.libre-entreprise.org/apidocs/</link> + </configuration> + </plugin--> + </plugins> + + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/assembly/deps.xml</descriptor> + <descriptor>src/main/assembly/full.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + <executions> + <execution> + <id>create-assembly</id> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + + </build> + + <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> + <!--Source control management--> + <scm> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> + </scm> + + <!-- Maven Environment : profiles --> + <profiles> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + + <!-- launch in a release the assembly automaticly --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-assembly</id> + <phase>package</phase> + </execution> + </executions> + </plugin> + + <!-- always add license and third-party files to classpath --> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + <version>${license-switcher.version}</version> + <configuration> + <licenseName>${license-switcher.licenseName}</licenseName> + </configuration> + <executions> + <execution> + <id>attach-licenses</id> + <goals> + <goal>license</goal> + <goal>third-party</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + + </build> + </profile> + </profiles> + </project> Added: jrst/trunk/src/main/assembly/deps.xml =================================================================== --- jrst/trunk/src/main/assembly/deps.xml (rev 0) +++ jrst/trunk/src/main/assembly/deps.xml 2009-02-05 22:01:26 UTC (rev 260) @@ -0,0 +1,34 @@ +<assembly> + <id>deps</id> + <formats> + <format>zip</format> + </formats> + <!-- This don't support SNAPSHOT --> + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <excludes> + <exclude>junit:junit</exclude> + <exclude>${artifact.groupId}:${artifact.artifactId}</exclude> + </excludes> + <scope>runtime</scope> + </dependencySet> + </dependencySets> + <files> + <file> + <!--source>target/${artifact.artifactId}-${artifact.version}.jar</source--> + <source>target/${project.build.finalName}.jar</source> + </file> + <file> + <source>target/classes/THIRD-PARTY.txt</source> + </file> + </files> + <fileSets> + <fileSet> + <includes> + <include>README*</include> + <include>LICENSE*</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Added: jrst/trunk/src/main/assembly/full.xml =================================================================== --- jrst/trunk/src/main/assembly/full.xml (rev 0) +++ jrst/trunk/src/main/assembly/full.xml 2009-02-05 22:01:26 UTC (rev 260) @@ -0,0 +1,38 @@ +<assembly> + <id>full</id> + <formats> + <format>zip</format> + </formats> + <!-- This don't support SNAPSHOT --> + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <excludes> + <exclude>${artifact.groupId}:${artifact.artifactId}</exclude> + </excludes> + <scope>runtime</scope> + </dependencySet> + </dependencySets> + <files> + <file> + <!--source>target/${artifact.artifactId}-${artifact.version}.jar</source--> + <source>target/${project.build.finalName}.jar</source> + </file> + <file> + <source>target/classes/THIRD-PARTY.txt</source> + </file> + </files> + <fileSets> + <fileSet> + <includes> + <include>README*</include> + <include>LICENSE*</include> + <include>pom.xml</include> + </includes> + </fileSet> + <fileSet> + <directory>src</directory> + <useDefaultExcludes>true</useDefaultExcludes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file