Author: tchemit Date: 2008-08-12 14:41:55 +0000 (Tue, 12 Aug 2008) New Revision: 1008 Modified: trunk/commandline/commandline-core/pom.xml trunk/commandline/commandline-demo/pom.xml trunk/commandline/commandline-ui-action/pom.xml trunk/commandline/commandline-ui/pom.xml trunk/commandline/maven-plugin/pom.xml trunk/commandline/pom.xml Log: utilisation de org.codelutin:lutinproject:2.4 :) Modified: trunk/commandline/commandline-core/pom.xml =================================================================== --- trunk/commandline/commandline-core/pom.xml 2008-08-12 14:24:48 UTC (rev 1007) +++ trunk/commandline/commandline-core/pom.xml 2008-08-12 14:41:55 UTC (rev 1008) @@ -7,14 +7,14 @@ <parent> <groupId>org.codelutin.commandline</groupId> <artifactId>commandline-pom</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.9</version> </parent> <artifactId>commandline-core</artifactId> <name>core</name> <packaging>jar</packaging> - <version>0.8-SNAPSHOT</version> + <version>0.9</version> <description>lutincommandline core library</description> <build> @@ -25,7 +25,6 @@ <artifactId>maven-i18n-plugin</artifactId> <executions> <execution> - <phase>compile</phase> <goals> <goal>parserJava</goal> <goal>gen</goal> Modified: trunk/commandline/commandline-demo/pom.xml =================================================================== --- trunk/commandline/commandline-demo/pom.xml 2008-08-12 14:24:48 UTC (rev 1007) +++ trunk/commandline/commandline-demo/pom.xml 2008-08-12 14:41:55 UTC (rev 1008) @@ -12,7 +12,7 @@ <parent> <groupId>org.codelutin.commandline</groupId> <artifactId>commandline-pom</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.9</version> </parent> <artifactId>commandline-demo</artifactId> @@ -53,7 +53,7 @@ <!-- ************************************************************* --> <name>commandline-demo</name> - <version>0.8-SNAPSHOT</version> + <version>0.9</version> <description>commandline demo module</description> <!-- ************************************************************* --> @@ -71,55 +71,16 @@ <build> <plugins> + <plugin> - <groupId>lutinplugin</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <!--execution> - <id>javaActionConfig</id> - <phase>compile</phase> - <goals> - <goal>parserJavaActionConfig</goal> - </goals> - <configuration> - <treateDefaultEntry>false</treateDefaultEntry> - <entries> - <entry> - <basedir>${maven.src.dir}/main/java</basedir> - <includes> - <param>org\/codelutin\/commandline\/demo\/ui\/actions\/**\/*Action.java</param> - </includes> - <excludes> - <param> - org\/codelutin\/commandline\/demo\/ui\/actions\/**\/*AbstractAction.java - </param> - </excludes> - </entry> - </entries> - </configuration> - </execution--> - <execution> - <id>java</id> - <phase>compile</phase> - <configuration> - <entries> - <entry> - <basedir>${maven.gen.dir}/java</basedir> - </entry> - </entries> - </configuration> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> </plugin> <plugin> <groupId>org.codelutin.commandline</groupId> <artifactId>maven-commandline-plugin</artifactId> - <version>${current.version}</version> + <version>0.9</version> <configuration> <prefix>CommandLineDemo</prefix> <packageName>org.codelutin.commandline.demo</packageName> @@ -128,7 +89,6 @@ <execution> <inherited>false</inherited> <!-- do not use generate phase, since it will be reexecuted a second time... --> - <phase>process-resources</phase> <id>genJava</id> <goals> <goal>genJava</goal> @@ -162,13 +122,44 @@ </plugin> <plugin> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <groupId>lutinplugin</groupId> + <artifactId>maven-i18n-plugin</artifactId> <executions> + <!--execution> + <id>javaActionConfig</id> + <phase>compile</phase> + <goals> + <goal>parserJavaActionConfig</goal> + </goals> + <configuration> + <treateDefaultEntry>false</treateDefaultEntry> + <entries> + <entry> + <basedir>${maven.src.dir}/main/java</basedir> + <includes> + <param>org\/codelutin\/commandline\/demo\/ui\/actions\/**\/*Action.java</param> + </includes> + <excludes> + <param> + org\/codelutin\/commandline\/demo\/ui\/actions\/**\/*AbstractAction.java + </param> + </excludes> + </entry> + </entries> + </configuration> + </execution--> <execution> - <id>generate jaxx</id> + <id>java</id> + <configuration> + <entries> + <entry> + <basedir>${maven.gen.dir}/java</basedir> + </entry> + </entries> + </configuration> <goals> - <goal>generate</goal> + <goal>parserJava</goal> + <goal>gen</goal> </goals> </execution> </executions> Modified: trunk/commandline/commandline-ui/pom.xml =================================================================== --- trunk/commandline/commandline-ui/pom.xml 2008-08-12 14:24:48 UTC (rev 1007) +++ trunk/commandline/commandline-ui/pom.xml 2008-08-12 14:41:55 UTC (rev 1008) @@ -12,7 +12,7 @@ <parent> <groupId>org.codelutin.commandline</groupId> <artifactId>commandline-pom</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.9</version> </parent> <artifactId>commandline-ui</artifactId> @@ -37,7 +37,7 @@ <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> <name>ui</name> - <version>0.8-SNAPSHOT</version> + <version>0.9</version> <description>lutin commandline UI librairy</description> <inceptionYear>2008</inceptionYear> @@ -55,21 +55,6 @@ <plugin> <groupId>org.codelutin.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>jaxx-swing</artifactId> - <scope>compile</scope> - <version>${jaxx.version}</version> - </dependency> - </dependencies> </plugin> <!-- i18n --> @@ -78,7 +63,6 @@ <artifactId>maven-i18n-plugin</artifactId> <executions> <execution> - <phase>compile</phase> <configuration> <entries> <entry> Modified: trunk/commandline/commandline-ui-action/pom.xml =================================================================== --- trunk/commandline/commandline-ui-action/pom.xml 2008-08-12 14:24:48 UTC (rev 1007) +++ trunk/commandline/commandline-ui-action/pom.xml 2008-08-12 14:41:55 UTC (rev 1008) @@ -11,7 +11,7 @@ <parent> <groupId>org.codelutin.commandline</groupId> <artifactId>commandline-pom</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.9</version> </parent> <artifactId>commandline-ui-action</artifactId> @@ -35,7 +35,7 @@ <!-- ************************************************************* --> <name>commandine-ui-action</name> - <version>0.8-SNAPSHOT</version> + <version>0.9</version> <description>basic actions implemented using jaxx-swing-action framework</description> <!-- ************************************************************* --> @@ -52,22 +52,6 @@ <plugin> <groupId>org.codelutin.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> - <executions> - <execution> - <phase>process-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>jaxx-swing</artifactId> - <scope>compile</scope> - <version>${jaxx.version}</version> - </dependency> - </dependencies> </plugin> <!-- Compile phase --> @@ -79,7 +63,6 @@ <executions> <execution> <id>javaActionConfig</id> - <phase>process-resources</phase> <goals> <goal>parserJavaActionConfig</goal> </goals> @@ -100,7 +83,6 @@ </execution> <execution> <id>java</id> - <phase>process-resources</phase> <goals> <goal>parserJava</goal> <goal>gen</goal> Modified: trunk/commandline/maven-plugin/pom.xml =================================================================== --- trunk/commandline/maven-plugin/pom.xml 2008-08-12 14:24:48 UTC (rev 1007) +++ trunk/commandline/maven-plugin/pom.xml 2008-08-12 14:41:55 UTC (rev 1008) @@ -12,9 +12,10 @@ <parent> <groupId>org.codelutin.commandline</groupId> <artifactId>commandline-pom</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.9</version> </parent> + <!--groupId>org.apache.maven.plugins</groupId--> <artifactId>maven-commandline-plugin</artifactId> <name>maven-plugin</name> @@ -50,7 +51,7 @@ <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> - <version>0.8-SNAPSHOT</version> + <version>0.9</version> <description> Plugin maven 2 pour la generation du parser d'options, des @@ -73,7 +74,6 @@ <artifactId>maven-i18n-plugin</artifactId> <executions> <execution> - <phase>compile</phase> <goals> <goal>parserJava</goal> <goal>gen</goal> @@ -81,6 +81,12 @@ </execution> </executions> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> + </plugin> + </plugins> </build> Modified: trunk/commandline/pom.xml =================================================================== --- trunk/commandline/pom.xml 2008-08-12 14:24:48 UTC (rev 1007) +++ trunk/commandline/pom.xml 2008-08-12 14:41:55 UTC (rev 1008) @@ -10,9 +10,9 @@ <!-- ************************************************************* --> <parent> - <groupId>lutinpom</groupId> + <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>2.3</version> + <version>2.4</version> </parent> <groupId>org.codelutin.commandline</groupId> @@ -37,23 +37,10 @@ <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> <name>pom</name> - <version>0.8-SNAPSHOT</version> + <version>0.9</version> <description>lutincommandline library main pom</description> <inceptionYear>2008</inceptionYear> - <!-- Developpers, contributors... --> - <developers> - <developer> - <name>Tony Chemit</name> - <email>chemit@codelutin.com</email> - <organization>Code Lutin</organization> - <timezone>+2</timezone> - <roles> - <role>Developer</role> - </roles> - </developer> - </developers> - <!-- ************************************************************* --> <!-- *** Build Settings ****************************************** --> <!-- ************************************************************* --> @@ -61,130 +48,48 @@ <packaging>pom</packaging> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>${maven.compile.source}</source> - <target>${maven.compile.target}</target> - <encoding>${maven.compile.encoding}</encoding> - </configuration> - </plugin> - <!-- i18n --> - <plugin> - <groupId>lutinplugin</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <configuration> - <bundles> - <param>fr_FR</param> - <param>en_GB</param> - </bundles> - <src>${maven.src.dir}/main/resources/i18n</src> - <defaultBasedir>${maven.src.dir}/main/java</defaultBasedir> - <keysModifier>false</keysModifier> - <keepBackup>false</keepBackup> - </configuration> - </plugin> - <!-- source--> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <!-- javadoc --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <!-- jrst --> - <plugin> - <groupId>lutinplugin</groupId> - <artifactId>maven-jrst-plugin</artifactId> - <executions> - <execution> - <id>jrst</id> - <phase>verify</phase> - <goals> - <goal>jrst</goal> - </goals> - </execution> - </executions> - <configuration> - <directoryIn>${maven.src.dir}/site</directoryIn> - <directoryOut>${basedir}/target/generated-site/xdoc</directoryOut> - <verbose>${maven.verbose}</verbose> - </configuration> - </plugin> - <!-- site --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <configuration> - <outputEncoding>${maven.compile.encoding}</outputEncoding> - <locales>fr</locales> - <siteDirectory>src/site</siteDirectory> - <generateReports>true</generateReports> - <xdocDirectory>${basedir}/target/generated-site/xdoc/fr/rst</xdocDirectory> - </configuration> - </plugin> + <pluginManagement> + <plugins> - <plugin> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - <dependencies> - <dependency> - <groupId>lutinlib</groupId> - <artifactId>lutinwidget</artifactId> - <version>0.10-SNAPSHOT</version> - </dependency> - </dependencies> - </plugin> - </plugins> + <plugin> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <version>${jaxx.version}</version> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutinwidget</artifactId> + <version>0.10-SNAPSHOT</version> + </dependency> + </dependencies> + </plugin> + + </plugins> + </pluginManagement> + </build> <properties> <!-- current version --> - <current.version>0.8-SNAPSHOT</current.version> + <current.version>0.9</current.version> <!-- jaxx version --> - <jaxx.version>0.3-SNAPSHOT</jaxx.version> + <jaxx.version>0.4</jaxx.version> <!-- id du projet du labs --> <labs.id>12</labs.id> <labs.project>lutinutil</labs.project> - <!-- compile with ? --> - <maven.compile.source>1.6</maven.compile.source> - <maven.compile.target>1.6</maven.compile.target> - <maven.compile.encoding>UTF-8</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 - </labs.lists> - <!-- maven will suffix with /${pom.artifactId} --> <maven.scm.developerConnection>scm:svn:svn+ssh://${username}@${labs.host}/svnroot/lutinutil/trunk </maven.scm.developerConnection> @@ -194,43 +99,6 @@ </properties> - <profiles> - <profile> - <id>project</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <!-- test (par defaut, on ne les execute pas) --> - <maven.test.skip>true</maven.test.skip> - <maven.reports.generate>false</maven.reports.generate> - </properties> - </profile> - <profile> - <id>tests</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <!-- test (par defaut, on les execute) --> - <maven.test.skip>false</maven.test.skip> - <maven.reports.generate>false</maven.reports.generate> - </properties> - </profile> - <profile> - <id>site</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <!-- test (par defaut, on ne les execute pas) --> - <maven.test.skip>true</maven.test.skip> - <maven.reports.generate>true</maven.reports.generate> - </properties> - </profile> - </profiles> - - <dependencyManagement> <dependencies> @@ -313,35 +181,14 @@ <version>2.0.4</version> </dependency> - - <!-- Plugins --> - <dependency> - <groupId>lutinplugin</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <version>0.4</version> - </dependency> - - <dependency> - <groupId>lutinplugin</groupId> - <artifactId>maven-jrst-plugin</artifactId> - <version>0.8</version> - </dependency> - - <dependency> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - <version>${jaxx.version}</version> - </dependency> - </dependencies> </dependencyManagement> <!-- the project is a module in a labs project (lutinutil), so we have to override this property (see in the parent pom for more explanation) --> - <scm> + <!--scm> <developerConnection>${maven.scm.developerConnection}</developerConnection> - <!--url>${maven.scm.url}</url--> - </scm> + </scm--> </project>