Author: tchemit Date: 2008-07-23 08:15:01 +0000 (Wed, 23 Jul 2008) New Revision: 883 Modified: trunk/commandline/commandline-ui/pom.xml trunk/commandline/pom.xml Log: utilisation des repertoires compiliant maven 2 suppression de maven-genclean-plugin du coup Modified: trunk/commandline/commandline-ui/pom.xml =================================================================== --- trunk/commandline/commandline-ui/pom.xml 2008-07-23 00:11:14 UTC (rev 882) +++ trunk/commandline/commandline-ui/pom.xml 2008-07-23 08:15:01 UTC (rev 883) @@ -48,38 +48,13 @@ <packaging>jar</packaging> <build> - <!-- where to generate jaxx java files --> - <resources> - <resource> - <directory>${basedir}/gen/java</directory> - </resource> - <resource> - <directory>${maven.src.dir}/main/resources</directory> - </resource> - </resources> - + <plugins> - <plugin> - <groupId>org.codelutin.maven.plugins</groupId> - <artifactId>maven-genclean-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>clean</goal> - </goals> - </execution> - </executions> - </plugin> - + <!-- jaxx --> <plugin> <groupId>org.codelutin.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> - <version>0.2-SNAPSHOT</version> - <configuration> - <src>${maven.src.dir}/main/uimodel</src> - <out>${basedir}/gen/java</out> - </configuration> <executions> <execution> <goals> @@ -92,7 +67,7 @@ <groupId>org.codelutin.jaxx</groupId> <artifactId>jaxx-swing</artifactId> <scope>compile</scope> - <version>0.2-SNAPSHOT</version> + <version>${jaxx.version}</version> </dependency> </dependencies> </plugin> @@ -107,7 +82,7 @@ <configuration> <entries> <entry> - <basedir>${basedir}/gen/java</basedir> + <basedir>${maven.gen.dir}/java</basedir> </entry> </entries> </configuration> Modified: trunk/commandline/pom.xml =================================================================== --- trunk/commandline/pom.xml 2008-07-23 00:11:14 UTC (rev 882) +++ trunk/commandline/pom.xml 2008-07-23 08:15:01 UTC (rev 883) @@ -138,6 +138,9 @@ <properties> + <!-- jaxx version --> + <jaxx.version>0.2-SNAPSHOT</jaxx.version> + <!-- id du projet du labs --> <labs.id>12</labs.id> @@ -150,6 +153,9 @@ <maven.compile.target>1.6</maven.compile.target> <maven.compile.encoding>ISO-8859-15</maven.compile.encoding> + <!--le repertoire de generation --> + <maven.gen.dir>${basedir}/target/generated-sources</maven.gen.dir> + <!-- Lists URL --> <labs.lists> http://lists.labs.libre-entreprise.org/mailman/listinfo/lutinutil @@ -220,7 +226,7 @@ <dependency> <groupId>org.codelutin.jaxx</groupId> <artifactId>jaxx-swing</artifactId> - <version>0.2-SNAPSHOT</version> + <version>${jaxx.version}</version> </dependency> <dependency> @@ -272,14 +278,9 @@ <dependency> <groupId>org.codelutin.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> - <version>0.2-SNAPHOT</version> + <version>${jaxx.version}</version> </dependency> - <dependency> - <groupId>org.codelutin.maven.plugins</groupId> - <artifactId>maven-genclean-plugin</artifactId> - <version>0.1-SNAPSHOT</version> - </dependency> </dependencies> </dependencyManagement>