Author: tchemit Date: 2009-05-11 03:43:26 +0000 (Mon, 11 May 2009) New Revision: 1515 Added: lutinutilextra/trunk/src/main/assembly/ lutinutilextra/trunk/src/main/assembly/deps.xml lutinutilextra/trunk/src/main/assembly/full.xml Modified: lutinutilextra/trunk/changelog.txt lutinutilextra/trunk/pom.xml lutinutilextra/trunk/src/site/site.xml Log: * bump versions (lutinproject, maven-license-switcher-plugin) * use doxia-modules-jrst instead of maven-jrst-plugin * improve download section on site Modified: lutinutilextra/trunk/changelog.txt =================================================================== --- lutinutilextra/trunk/changelog.txt 2009-05-11 02:57:51 UTC (rev 1514) +++ lutinutilextra/trunk/changelog.txt 2009-05-11 03:43:26 UTC (rev 1515) @@ -1,3 +1,11 @@ +ver 1.0.0 ? + * migrate to org.nuiton groupId + +ver 0.3 chemit 20090511 + * bump versions (lutinproject, maven-license-switcher-plugin) + * use doxia-modules-jrst instead of maven-jrst-plugin + * improve download section on site + ver-0-2 chemit 20090218 * 20090205 [chemit] use lutinproject 3.4 * 20081118 [chemit] use lutinproject 3.1 + clean pom + produce javadoc Modified: lutinutilextra/trunk/pom.xml =================================================================== --- lutinutilextra/trunk/pom.xml 2009-05-11 02:57:51 UTC (rev 1514) +++ lutinutilextra/trunk/pom.xml 2009-05-11 03:43:26 UTC (rev 1515) @@ -9,7 +9,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.4</version> + <version>3.5.4</version> </parent> <artifactId>lutinutilextra</artifactId> @@ -75,24 +75,34 @@ <build> <defaultGoal>install</defaultGoal> - <plugins> - <!-- Always process jrst files, but only called on pre-site phase --> - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jrst-plugin</artifactId> - <version>0.8.4</version> - <configuration> - <defaultLocale>fr</defaultLocale> - </configuration> - <executions> - <execution> - <goals> - <goal>jrst</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> + <pluginManagement> + <plugins> + + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>1.0.0</version> + </dependency> + </dependencies> + </plugin> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.1</version> + <configuration> + <descriptors> + <descriptor>src/main/assembly/deps.xml</descriptor> + <descriptor>src/main/assembly/full.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> <!-- ************************************************************* --> <!-- *** Build Environment ************************************** --> @@ -134,28 +144,40 @@ <build> <plugins> - <!-- launch in a release the assembly automaticly --> + <!-- always add license and third-party files to classpath --> <plugin> - <artifactId>maven-assembly-plugin</artifactId> + <groupId>org.codelutin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + <version>0.8</version> <executions> <execution> - <id>create-assembly</id> - <phase>package</phase> + <id>attach-licenses</id> + <goals> + <goal>license</goal> + <goal>third-party</goal> + </goals> </execution> </executions> </plugin> - <!-- always add license and third-party files to classpath --> <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.6</version> + <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> - <id>attach-licenses</id> + <id>copy-dependencies</id> + </execution> + </executions> + </plugin> + + <!-- launch in a release the assembly automaticly --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>attach-assembly</id> + <phase>verify</phase> <goals> - <goal>license</goal> - <goal>third-party</goal> + <goal>single</goal> </goals> </execution> </executions> Added: lutinutilextra/trunk/src/main/assembly/deps.xml =================================================================== --- lutinutilextra/trunk/src/main/assembly/deps.xml (rev 0) +++ lutinutilextra/trunk/src/main/assembly/deps.xml 2009-05-11 03:43:26 UTC (rev 1515) @@ -0,0 +1,55 @@ + +<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> + + <fileSets> + <!-- asm artifacts are in snapshot --> + <fileSet> + <directory>target/lib</directory> + <outputDirectory>lib</outputDirectory> + <includes> + <include>*-SNAPSHOT.jar</include> + </includes> + </fileSet> + <fileSet> + <directory>target</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + <excludes> + <exclude>*-sources.jar</exclude> + <exclude>*-javadoc.jar</exclude> + </excludes> + </fileSet> + <fileSet> + <outputDirectory>/</outputDirectory> + <includes> + <include>README*</include> + <include>LICENSE*</include> + <include>pom.xml</include> + </includes> + </fileSet> + <fileSet> + <outputDirectory>/</outputDirectory> + <directory>target/classes</directory> + <includes> + <include>THIRD-PARTY.txt</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Added: lutinutilextra/trunk/src/main/assembly/full.xml =================================================================== --- lutinutilextra/trunk/src/main/assembly/full.xml (rev 0) +++ lutinutilextra/trunk/src/main/assembly/full.xml 2009-05-11 03:43:26 UTC (rev 1515) @@ -0,0 +1,55 @@ +<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> + <fileSets> + <!-- asm artifacts are in snapshot --> + <fileSet> + <directory>target/lib</directory> + <outputDirectory>lib</outputDirectory> + <includes> + <include>*-SNAPSHOT.jar</include> + </includes> + </fileSet> + <fileSet> + <directory>target</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + <excludes> + <exclude>*-sources.jar</exclude> + </excludes> + </fileSet> + <fileSet> + <outputDirectory>/</outputDirectory> + <includes> + <include>README*</include> + <include>LICENSE*</include> + <include>pom.xml</include> + </includes> + </fileSet> + <fileSet> + <outputDirectory>/</outputDirectory> + <directory>target/classes</directory> + <includes> + <include>THIRD-PARTY.txt</include> + </includes> + </fileSet> + <fileSet> + <directory>src</directory> + <!--useDefaultExcludes>true</useDefaultExcludes--> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Modified: lutinutilextra/trunk/src/site/site.xml =================================================================== --- lutinutilextra/trunk/src/site/site.xml 2009-05-11 02:57:51 UTC (rev 1514) +++ lutinutilextra/trunk/src/site/site.xml 2009-05-11 03:43:26 UTC (rev 1515) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<project name="LutinUtilExtra"> +<project name="${project.name}"> <skin> <groupId>org.codelutin</groupId> @@ -36,10 +36,16 @@ </menu> <menu name="T�l�chargement"> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}" - name="T�l�charger la derni�re version"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}" - name="Voir toutes les versions"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-deps.zip" + name="Bundle sans sources (zip)"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-full.zip" + name="Bundle compl�t (zip)"/> </menu> <menu name="Developpeur">