Author: tchemit Date: 2009-02-20 19:11:28 +0000 (Fri, 20 Feb 2009) New Revision: 1561 Modified: branches/migration-200901/simexplorer-is/pom.xml branches/migration-200901/simexplorer-is/simexplorer-is-swing/pom.xml Log: use lutinproject 3.4 use zeroConf in jrst use zeroConf in license-switcher Modified: branches/migration-200901/simexplorer-is/pom.xml =================================================================== --- branches/migration-200901/simexplorer-is/pom.xml 2009-02-16 15:05:45 UTC (rev 1560) +++ branches/migration-200901/simexplorer-is/pom.xml 2009-02-20 19:11:28 UTC (rev 1561) @@ -12,7 +12,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.3</version> + <version>3.4</version> </parent> <groupId>simexplorer-is</groupId> @@ -239,7 +239,7 @@ <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> - <name>${project.artifactId}</name> + <name>${project.artifactId}</name> <description>SimExplorer Information System</description> <inceptionYear>2008</inceptionYear> @@ -257,7 +257,7 @@ </organization> <contributors> - <contributor> + <contributor> <name>Gabriel Landais</name> <email>landais at codelutin.com</email> <organization>Code Lutin</organization> @@ -283,22 +283,17 @@ <!-- labs project name --> <labs.project>simexplorer-si</labs.project> - <!-- jaxx version --> - <jaxx.version>1.1-SNAPSHOT</jaxx.version> - - <!-- commandline version --> + <!-- customized libs --> + <jaxx.version>1.1</jaxx.version> <commandline.version>1.0-SNAPSHOT</commandline.version> + <lutinutil.version>1.0.3</lutinutil.version> + <lutinwidget.version>0.13</lutinwidget.version> + <i18n.version>0.9</i18n.version> + <jrst.version>0.8.4</jrst.version> + <license-switcher.version>0.6</license-switcher.version> - <!-- lutinutil version --> - <lutinutil.version>1.0.3-SNAPSHOT</lutinutil.version> - - <!-- lutinwidget version --> - <lutinwidget.version>0.12</lutinwidget.version> - - <!-- Tapestry version --> + <tapestry.version>5.0.11</tapestry.version> - - <!-- jboss version --> <jboss.version>4.2.2.GA</jboss.version> <!-- TODO make svn compatiblewith our svn layout conventions --> @@ -366,7 +361,24 @@ <plugins> + <!-- 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> + <defaultLocale>fr</defaultLocale> + </configuration> + <executions> + <execution> + <goals> + <goal>jrst</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> + </build> <!-- ************************************************************* --> @@ -379,13 +391,24 @@ <developerConnection>${maven.scm.developerConnection}</developerConnection> </scm> - <prerequisites> - <maven>2.0.8</maven> - </prerequisites> - <repositories> + <!--Code Lutin Repository--> <repository> + <id>SEIS-codelutin</id> + <name>CodeLutinRepository</name> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + + <repository> <id>SEIS-java.net</id> <url>http://download.java.net/maven/2</url> </repository> @@ -398,4 +421,35 @@ </repositories> + <profiles> + <!-- perform only on a release stage when using the maven-release-plugin --> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <!-- 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> + <executions> + <execution> + <id>attach-licenses</id> + <goals> + <goal>license</goal> + <goal>third-party</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: branches/migration-200901/simexplorer-is/simexplorer-is-swing/pom.xml =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing/pom.xml 2009-02-16 15:05:45 UTC (rev 1560) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing/pom.xml 2009-02-20 19:11:28 UTC (rev 1561) @@ -146,7 +146,7 @@ <bundles> <bundle>fr_FR</bundle> <bundle>en_GB</bundle> - </bundles> + </bundles> <i18nCP>${maven.src.dir}/main/resources</i18nCP> </configuration> </execution> @@ -237,6 +237,14 @@ </configuration> </execution> </executions> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + <version>${lutinutil.version}</version> + </dependency> + </dependencies> + </plugin> <plugin>