Author: tchemit Date: 2009-05-10 16:55:36 +0000 (Sun, 10 May 2009) New Revision: 190 Modified: lutinprocessor/trunk/changelog.txt lutinprocessor/trunk/pom.xml lutinprocessor/trunk/src/main/assembly/deps.xml lutinprocessor/trunk/src/main/assembly/full.xml Log: fix issues in assembly descriptor and attach the plugin execution in release profile otherwise we must do a checkout of the released version, then apply goal, not very automatic method... :) Modified: lutinprocessor/trunk/changelog.txt =================================================================== --- lutinprocessor/trunk/changelog.txt 2009-05-10 16:26:52 UTC (rev 189) +++ lutinprocessor/trunk/changelog.txt 2009-05-10 16:55:36 UTC (rev 190) @@ -5,6 +5,7 @@ * bump lutinproject to 3.5.4, maven-license-switcher-plugin to 0.8 * use pluginManagment for plugins configuration * use doxia-modules-jrst instead of maven-jrst-plugin + * fix issues in assembly descriptor and attach the plugin execution in release profile ver-0-17 chemit (20090218) * Parent is org.codelutin:lutinproject:3.4 Modified: lutinprocessor/trunk/pom.xml =================================================================== --- lutinprocessor/trunk/pom.xml 2009-05-10 16:26:52 UTC (rev 189) +++ lutinprocessor/trunk/pom.xml 2009-05-10 16:55:36 UTC (rev 190) @@ -55,48 +55,7 @@ </properties> <build> - <plugins> - - <!-- jrst --> - <!--plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jrst-plugin</artifactId> - <version>0.8.4</version> - <configuration> - <directoryIn>${maven.src.dir}/site</directoryIn> - <directoryOut>${maven.site.gen.dir}</directoryOut> - <defaultLocale>fr</defaultLocale> - <inputEncoding>${project.build.sourceEncoding}</inputEncoding> - <outputEncoding>${project.build.sourceEncoding}</outputEncoding> - </configuration> - <executions> - <execution> - <phase>pre-site</phase> - <goals> - <goal>jrst</goal> - </goals> - </execution> - </executions> - </plugin--> - - <!--plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/main/assembly/deps.xml</descriptor> - <descriptor>src/main/assembly/full.xml</descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin--> - </plugins> - + <pluginManagement> <plugins> @@ -108,14 +67,7 @@ <descriptor>src/main/assembly/deps.xml</descriptor> <descriptor>src/main/assembly/full.xml</descriptor> </descriptors> - </configuration> - <executions> - <execution> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> + </configuration> </plugin> <plugin> @@ -199,6 +151,14 @@ <plugin> <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> </plugin> </plugins> Modified: lutinprocessor/trunk/src/main/assembly/deps.xml =================================================================== --- lutinprocessor/trunk/src/main/assembly/deps.xml 2009-05-10 16:26:52 UTC (rev 189) +++ lutinprocessor/trunk/src/main/assembly/deps.xml 2009-05-10 16:55:36 UTC (rev 190) @@ -1,3 +1,4 @@ + <assembly> <id>deps</id> <formats> @@ -13,22 +14,34 @@ </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> + </dependencySets> + <fileSets> <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 Modified: lutinprocessor/trunk/src/main/assembly/full.xml =================================================================== --- lutinprocessor/trunk/src/main/assembly/full.xml 2009-05-10 16:26:52 UTC (rev 189) +++ lutinprocessor/trunk/src/main/assembly/full.xml 2009-05-10 16:55:36 UTC (rev 190) @@ -1,3 +1,4 @@ + <assembly> <id>full</id> <formats> @@ -13,26 +14,35 @@ <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> + <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> + <!--useDefaultExcludes>true</useDefaultExcludes--> </fileSet> </fileSets> </assembly> \ No newline at end of file