Author: tchemit Date: 2009-07-11 11:05:59 +0000 (Sat, 11 Jul 2009) New Revision: 1582 Modified: trunk/simexplorer-is/pom.xml trunk/simexplorer-is/simexplorer-is-entities/pom.xml trunk/simexplorer-is/simexplorer-is-security/pom.xml trunk/simexplorer-is/simexplorer-is-service/pom.xml trunk/simexplorer-is/simexplorer-is-storage/pom.xml trunk/simexplorer-is/simexplorer-is-swing/pom.xml trunk/simexplorer-is/simexplorer-is-web/pom.xml Log: migrate to nuiton : first stage (poms + plugins) Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2009-07-11 09:12:23 UTC (rev 1581) +++ trunk/simexplorer-is/pom.xml 2009-07-11 11:05:59 UTC (rev 1582) @@ -9,11 +9,11 @@ <!-- *** POM Relationships *************************************** --> <!-- ************************************************************* --> - <parent> + <!--parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> <version>3.4</version> - </parent> + </parent--> <groupId>simexplorer-is</groupId> <artifactId>simexplorer-is</artifactId> @@ -29,12 +29,12 @@ <module>simexplorer-is-ear</module> </modules> - <dependencies> + <!--dependencies> <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> </dependency> - </dependencies> + </dependencies--> <dependencyManagement> <dependencies> @@ -176,6 +176,20 @@ <!-- autres librairies --> <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.6</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> <version>2.3</version> @@ -237,6 +251,7 @@ <name>${project.artifactId}</name> <description>SimExplorer Information System</description> <inceptionYear>2008</inceptionYear> + <url>http://simexplorer-si.labs.libre-entreprise.org</url> <licenses> <license> @@ -272,12 +287,57 @@ <properties> - <!-- labs project number --> + <!-- labs --> <labs.id>130</labs.id> - - <!-- labs project name --> <labs.project>simexplorer-si</labs.project> + <labs.list.host>lists.labs.libre-entreprise.org</labs.list.host> + <!--i18n.bundles>fr_FR</i18n.bundles--> + + <!-- java level is 1.6 --> + <maven.compile.source>1.6</maven.compile.source> + <maven.compile.target>1.6</maven.compile.target> + + <!-- default encoding --> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + + <!-- by default, use maven 2 source base dir --> + <maven.src.dir>${basedir}/src</maven.src.dir> + + <!-- where to generate sources --> + <maven.gen.dir>${project.build.directory}/generated-sources</maven.gen.dir> + + <!-- where to generate test sources --> + <maven.test.gen.dir>${project.build.directory}/generated-test-sources</maven.test.gen.dir> + + <!-- locales for the site generation, by default only french --> + <maven.site.locales>fr</maven.site.locales> + + <!-- to allow bad tests --> + <maven.test.testFailureIgnore>false</maven.test.testFailureIgnore> + + <!-- to skip tests (can use also profile notests) --> + <maven.test.skip>false</maven.test.skip> + + <!-- to control fork mode of tests --> + <maven.test.forkMode>once</maven.test.forkMode> + + <!-- to activate generation of reports and javadoc when doing a site --> + <maven.reports.generate>true</maven.reports.generate> + + <!-- pour ne pas generer la javadoc (quand on aura un javadoc 2.5) --> + <maven.javadoc.skip>false</maven.javadoc.skip> + + <!-- do not use 2.5 version, it is buggy (crazy aggregate mode !) --> + <javadoc.version>2.4</javadoc.version> + + <!-- default license to use --> + <license.licenseName>gpl_v3</license.licenseName> + + <!-- release repository url (to be used in site.xml) --> + <repository.home.url>http://lutinbuilder.labs.libre-entreprise.org/maven2</repository.home.url> + <!-- customized libs --> <jaxx.version>1.3</jaxx.version> <commandline.version>1.0</commandline.version> @@ -291,50 +351,183 @@ <tapestry.version>5.0.11</tapestry.version> <jboss.version>4.2.2.GA</jboss.version> - <!-- TODO make svn compatiblewith our svn layout conventions --> + </properties> + + <build> - <maven.scm.url> - http://${labs.host}/plugins/scmsvn/viewcvs.php/trunk/${project.artifactId}?root=${labs.project} - </maven.scm.url> + <pluginManagement> + <plugins> - <maven.scm.developerConnection> - scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/trunk/${project.artifactId} - </maven.scm.developerConnection> + <!-- plugin resources --> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.3</version> + <configuration> + <encoding>${project.build.sourceEncoding}</encoding> + </configuration> + </plugin> - <maven.scm.connection> - scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/trunk/${project.artifactId} - </maven.scm.connection> + <!-- plugin compiler --> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <fork>true</fork> + <source>${maven.compile.source}</source> + <target>${maven.compile.target}</target> + <encoding>${project.build.sourceEncoding}</encoding> + </configuration> + </plugin> - <!-- multi-module level one son pom scm properties --> - <maven.scm.url.child> - http://${labs.host}/plugins/scmsvn/viewcvs.php/trunk/${project.parent.artifactId}/${project.artifactId}?root=${labs.project} - </maven.scm.url.child> + <!-- plugin surefire --> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> + <configuration> + <excludes> + <exclude>**/*MassTestCase.java</exclude> + </excludes> + <forkMode>once</forkMode> + <skip>${maven.test.skip}</skip> + <testFailureIgnore>${maven.test.testFailureIgnore}</testFailureIgnore> + </configuration> + </plugin> - <maven.scm.developerConnection.child> - scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/trunk/${project.parent.artifactId}/${project.artifactId} - </maven.scm.developerConnection.child> + <!-- plugin dependency --> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.1</version> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <silent>true</silent> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> - <maven.scm.connection.child> - scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/trunk/${project.parent.artifactId}/${project.artifactId} - </maven.scm.connection.child> + <!-- plugin jar --> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <version>2.2</version> + <inherited>true</inherited> - </properties> + <configuration> + <archive> + <!-- cela fait bugger le chargement des service via + ServiceLoader donc on desactive --> + <!--index>true</index--> + <manifest> + <mainClass>${maven.jar.main.class}</mainClass> + </manifest> + <manifestEntries> + <url>${pom.url}</url> + </manifestEntries> + <index>false</index> + </archive> + </configuration> + </plugin> - <build> - <!-- no default goal, otherwise it hides goal to be used in profiles --> - <!--defaultGoal>install</defaultGoal--> + <!-- plugin source --> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <version>2.1</version> + <inherited>true</inherited> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> - <pluginManagement> - <plugins> + <!-- plugin javadoc --> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadoc.version}</version> + <configuration> + <docencoding>${project.reporting.outputEncoding}</docencoding> + <encoding>${project.reporting.outputEncoding}</encoding> + <charset>${project.reporting.outputEncoding}</charset> + <quiet>true</quiet> + <excludePackageNames>${maven.javadoc.excludePackageNames}</excludePackageNames> + </configuration> + <executions> + <execution> + <id>attach-javadocs</id> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <attach>true</attach> + <quiet>true</quiet> + <!-- uniquement a partir de javadoc 2.5 --> + <!--skip>${maven.javadoc.skip}</skip--> + </configuration> + </execution> + </executions> + </plugin> + + <!-- plugin site --> <plugin> + <artifactId>maven-site-plugin</artifactId> + <version>2.0</version> + <configuration> + <inputEncoding>${project.reporting.outputEncoding}</inputEncoding> + <outputEncoding>${project.reporting.outputEncoding}</outputEncoding> + <generateReports>${maven.reports.generate}</generateReports> + <locales>fr</locales> + <attach>false</attach> + </configuration> + <dependencies> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>1.0.2-rc-1</version> + </dependency> + </dependencies> + </plugin> + + <plugin> + <artifactId>maven-release-plugin</artifactId> + <version>2.0-beta-9</version> + </plugin> + + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <version>2.5</version> + </plugin> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-4</version> + </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + </plugin> + + <plugin> <artifactId>maven-ejb-plugin</artifactId> <configuration> <ejbVersion>3.0</ejbVersion> </configuration> </plugin> - <plugin> + <!--plugin> <groupId>org.codelutin</groupId> <artifactId>maven-i18n-plugin</artifactId> <version>${i18n.version}</version> @@ -345,57 +538,147 @@ <version>${lutinutil.version}</version> </dependency> </dependencies> - </plugin> + </plugin--> <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>1.0.0-rc-4</version> + <!--version>${i18n.version}</version--> <configuration> - <skip>${maven.test.skip}</skip> - <excludes> - <exclude>**/*MassTestCase.java</exclude> - </excludes> + <bundles>fr_FR</bundles> </configuration> </plugin> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>${helper.version}</version> + </plugin> + + <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <version>${jaxx.version}</version> + </plugin> + </plugins> </pluginManagement> + + </build> + + <!--Site--> + <reporting> <plugins> - <!-- Always process jrst files, but only called on pre-site phase --> + <!-- + The Project Info Reports Plugin has twelve goals: + see http://maven.apache.org/plugins/maven-project-info-reports-plugin + --> <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jrst-plugin</artifactId> - <version>${jrst.version}</version> + <!--groupId>org.nuiton.thirdparty</groupId--> + <artifactId>maven-project-info-reports-plugin</artifactId> + <!-- TODO il faut que la version patche soit en org.nuiton --> + <version>2.1.1-cl</version> + <reportSets> + <reportSet> + <reports> + <report>summary</report> + <report>license</report> + <report>cim</report> + <report>scm</report> + <report>mailing-list</report> + <!--report>dependencies</report--> + <report>project-team</report> + </reports> + </reportSet> + </reportSets> + </plugin> + + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadoc.version}</version> <configuration> - <defaultLocale>fr</defaultLocale> + <quiet>true</quiet> + <docencoding>${project.build.sourceEncoding}</docencoding> + <encoding>${project.build.sourceEncoding}</encoding> + <excludePackageNames>${maven.javadoc.excludePackageNames}</excludePackageNames> </configuration> - <executions> - <execution> - <goals> - <goal>jrst</goal> - </goals> - </execution> - </executions> </plugin> + + <plugin> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>2.4.3</version> + </plugin> + </plugins> - - </build> + </reporting> <!-- ************************************************************* --> <!-- *** Build Environment ************************************** --> <!-- ************************************************************* --> + <!-- prerequisites --> + <prerequisites> + <maven>[2.0.10,)</maven> + </prerequisites> + + <ciManagement> + <system>hudson</system> + <url>http://hudson.nuiton.org</url> + </ciManagement> + + <!--Any mailing lists for the project--> + <mailingLists> + + <mailingList> + <name>${projectId}-commits</name> + <subscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-commits</subscribe> + <unsubscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-commits</unsubscribe> + <post>${projectId}-commits@${labs.list.host}</post> + <archive>http://${labs.list.host}/pipermail/${projectId}-commits/</archive> + </mailingList> + + <mailingList> + <name>${projectId}-devel</name> + <subscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-devel</subscribe> + <unsubscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-devel</unsubscribe> + <post>${projectId}-devel@${labs.list.host}</post> + <archive>http://${labs.list.host}/pipermail/${projectId}-devel/</archive> + </mailingList> + + <mailingList> + <name>${projectId}-users</name> + <subscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-users</subscribe> + <unsubscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-users</unsubscribe> + <post>${projectId}-users@${labs.list.host}</post> + <archive>http://${labs.list.host}/pipermail/${projectId}-users/</archive> + </mailingList> + + </mailingLists> + + <!--Distribution--> + <distributionManagement> + <repository> + <id>codelutin</id> + <url>scpexe://labs.libre-entreprise.org/home/groups/lutinbuilder/htdocs/maven2</url> + </repository> + <site> + <id>codelutin</id> + <url>scpexe://labs.libre-entreprise.org/home/groups/observe/htdocs/observe</url> + </site> + </distributionManagement> + <scm> - <url>${maven.scm.url}</url> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/simexplorer-si/trunk/simexplorer-is</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/simexplorer-si/trunk/simexplorer-is</developerConnection> + <!--url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/simexplorer-si/trunk/simexplorer-is?root=simexplorer-si</url--> </scm> <repositories> - <!--Code Lutin Repository--> + <!--Code Lutin Repository--> <repository> <id>SEIS-codelutin</id> <name>CodeLutinRepository</name> @@ -410,7 +693,37 @@ </releases> </repository> + <!-- depot des releases nuiton --> + <repository> + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + + <!-- depot des snapshots nuiton --> + + <repository> + <id>nuiton.snapshot</id> + <name>NuitonSnapshotRepository</name> + <url>http://maven.nuiton.org/snapshot</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + + <repository> <id>SEIS-java.net</id> <url>http://download.java.net/maven/2</url> </repository> @@ -424,7 +737,68 @@ </repositories> + <pluginRepositories> + + <!-- depot des releases labs --> + + <pluginRepository> + + <id>labs.release</id> + <name>LabsReleaseRepository</name> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </pluginRepository> + <!-- depot des releases nuiton --> + + <pluginRepository> + + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </pluginRepository> + + <!-- depot des snapshots nuiton --> + + <pluginRepository> + <id>nuiton.snapshot</id> + <name>NuitonSnapshotRepository</name> + <url>http://maven.nuiton.org/snapshot</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </pluginRepository> + + </pluginRepositories> + <profiles> + <!-- do not execute tests (generaly a bad idea...) --> + <profile> + <id>notests</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <properties> + <maven.test.skip>true</maven.test.skip> + </properties> + </profile> + <!-- perform only on a release stage when using the maven-release-plugin --> <profile> <id>release-profile</id> @@ -435,24 +809,140 @@ </property> </activation> <build> + <plugins> + + <!-- always check labs properties --> + <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>validate-project</id> + <goals> + <goal>enforce</goal> + </goals> + <phase>initialize</phase> + </execution> + </executions> + <configuration> + <rules> + <requireFilesExist> + <files> + <file>changelog.txt</file> + <file>LICENSE.txt</file> + <file>README.txt</file> + </files> + </requireFilesExist> + </rules> + <ignoreCache>true</ignoreCache> + <failFast>true</failFast> + <fail>true</fail> + + </configuration> + </plugin> + + <!-- always compute source jar --> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + </execution> + </executions> + </plugin> + + <!-- always compute javadoc jar --> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>attach-javadocs</id> + </execution> + </executions> + </plugin> + <!-- 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> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> <executions> <execution> <id>attach-licenses</id> <goals> - <goal>license</goal> - <goal>third-party</goal> + <goal>add-license</goal> + <goal>add-third-party</goal> </goals> </execution> </executions> </plugin> + </plugins> + </build> </profile> + + <!-- use this plugin to run the main class --> + <profile> + <id>run</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <defaultGoal>compile</defaultGoal> + <plugins> + <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>run</id> + <goals> + <goal>enforce</goal> + </goals> + <phase>initialize</phase> + <configuration> + <rules> + <requireProperty> + <property>maven.jar.main.class</property> + <message>Could not find the "maven.jar.main.class" required property, use + -Dmaven.jar.main.class=your.main.class.fqn + </message> + </requireProperty> + </rules> + <ignoreCache>true</ignoreCache> + <failFast>true</failFast> + <fail>true</fail> + + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>run</id> + <goals> + <goal>java</goal> + </goals> + <phase>compile</phase> + <configuration> + <mainClass>${maven.jar.main.class}</mainClass> + <classpathScope>runtime</classpathScope> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + <properties> + <exec.mainClass>${maven.jar.main.class}</exec.mainClass> + <exec.classpathScope>runtime</exec.classpathScope> + </properties> + </profile> + </profiles> + </project> Modified: trunk/simexplorer-is/simexplorer-is-entities/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/pom.xml 2009-07-11 09:12:23 UTC (rev 1581) +++ trunk/simexplorer-is/simexplorer-is-entities/pom.xml 2009-07-11 11:05:59 UTC (rev 1582) @@ -17,10 +17,15 @@ <artifactId>simexplorer-is-entities</artifactId> <dependencies> + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> </dependency> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + </dependency> </dependencies> <!-- ************************************************************* --> @@ -39,7 +44,8 @@ <build> <plugins> <plugin> - <groupId>org.codelutin</groupId> + <!--groupId>org.codelutin</groupId--> + <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> <executions> <execution> @@ -52,15 +58,5 @@ </plugin> </plugins> </build> - - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - - <scm> - <url>${maven.scm.url.child}</url> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - </scm> - + </project> Modified: trunk/simexplorer-is/simexplorer-is-security/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/pom.xml 2009-07-11 09:12:23 UTC (rev 1581) +++ trunk/simexplorer-is/simexplorer-is-security/pom.xml 2009-07-11 11:05:59 UTC (rev 1582) @@ -36,6 +36,11 @@ <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + </dependency> + <!-- jboss dependencies --> <dependency> @@ -101,13 +106,7 @@ <!-- *** Build Environment ************************************** --> <!-- ************************************************************* --> - <scm> - <url>${maven.scm.url.child}</url> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - </scm> - - <repositories> + <!--repositories> <repository> <snapshots> <enabled>false</enabled> @@ -116,6 +115,6 @@ <name>ejb3unit repository</name> <url>http://ejb3unit.sourceforge.net/maven2</url> </repository> - </repositories> + </repositories--> </project> Modified: trunk/simexplorer-is/simexplorer-is-service/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/pom.xml 2009-07-11 09:12:23 UTC (rev 1581) +++ trunk/simexplorer-is/simexplorer-is-service/pom.xml 2009-07-11 11:05:59 UTC (rev 1582) @@ -79,6 +79,11 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + </dependencies> <!-- ************************************************************* --> @@ -102,7 +107,8 @@ <build> <plugins> <plugin> - <groupId>org.codelutin</groupId> + <groupId>org.nuiton.i18n</groupId> + <!--groupId>org.codelutin</groupId--> <artifactId>maven-i18n-plugin</artifactId> <executions> <execution> @@ -116,16 +122,6 @@ </plugins> </build> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - - <scm> - <url>${maven.scm.url.child}</url> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - </scm> - <repositories> <!-- pour la dependance rmiio --> <repository> Modified: trunk/simexplorer-is/simexplorer-is-storage/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/pom.xml 2009-07-11 09:12:23 UTC (rev 1581) +++ trunk/simexplorer-is/simexplorer-is-storage/pom.xml 2009-07-11 11:05:59 UTC (rev 1582) @@ -41,6 +41,12 @@ <groupId>jboss</groupId> <artifactId>jboss-ejb3x</artifactId> </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + </dependencies> @@ -64,14 +70,4 @@ </properties> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - - <scm> - <url>${maven.scm.url.child}</url> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - </scm> - </project> \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2009-07-11 09:12:23 UTC (rev 1581) +++ trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2009-07-11 11:05:59 UTC (rev 1582) @@ -74,6 +74,11 @@ <artifactId>lutinwidget</artifactId> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + </dependencies> <!-- ************************************************************* --> @@ -175,7 +180,8 @@ </plugin> <plugin> - <groupId>org.codelutin</groupId> + <groupId>org.nuiton.i18n</groupId> + <!--groupId>org.codelutin</groupId--> <artifactId>maven-i18n-plugin</artifactId> <executions> <execution> @@ -233,29 +239,26 @@ </configuration> </execution> </executions> - <dependencies> + <!--dependencies> <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> <version>${lutinutil.version}</version> </dependency> - </dependencies> - + </dependencies--> </plugin> <plugin> <artifactId>maven-dependency-plugin</artifactId> - <configuration> + <!--configuration> <overWriteReleases>false</overWriteReleases> <overWriteSnapshots>false</overWriteSnapshots> <overWriteIfNewer>true</overWriteIfNewer> <outputDirectory>${project.build.directory}/lib</outputDirectory> - </configuration> + </configuration--> <executions> <execution> - <goals> - <goal>copy-dependencies</goal> - </goals> + <id>copy-dependencies</id> </execution> </executions> </plugin> @@ -282,12 +285,6 @@ <!-- *** Build Environment ************************************** --> <!-- ************************************************************* --> - <scm> - <url>${maven.scm.url.child}</url> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - </scm> - <pluginRepositories> <pluginRepository> <id>evolvis-release-repository</id> Modified: trunk/simexplorer-is/simexplorer-is-web/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/pom.xml 2009-07-11 09:12:23 UTC (rev 1581) +++ trunk/simexplorer-is/simexplorer-is-web/pom.xml 2009-07-11 11:05:59 UTC (rev 1582) @@ -63,7 +63,7 @@ <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>servlet-api</artifactId> </dependency> <!-- test dependencies --> @@ -96,7 +96,7 @@ <!--WebApp in JAR --> <plugin> <artifactId>maven-war-plugin</artifactId> - <version>2.0.2</version> + <!--version>2.0.2</version--> <configuration> <warSourceDirectory>${basedir}/src/main/webapp</warSourceDirectory> <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes> @@ -134,14 +134,4 @@ </plugins> </build> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - - <scm> - <url>${maven.scm.url.child}</url> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - </scm> - </project> \ No newline at end of file