Author: tchemit Date: 2010-11-23 08:55:27 +0100 (Tue, 23 Nov 2010) New Revision: 123 Url: http://chorem.org/repositories/revision/bow/123 Log: reformat pom make pom works with mavnepom 2.4.1 update nuiton-utils to 1.4.2 (a api changed in StringUtil) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-22 17:54:53 UTC (rev 122) +++ trunk/pom.xml 2010-11-23 07:55:27 UTC (rev 123) @@ -1,249 +1,214 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>2.4.1</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>2.4.1</version> + </parent> - <groupId>org.chorem</groupId> - <artifactId>bow</artifactId> - <version>0.3-SNAPSHOT</version> + <groupId>org.chorem</groupId> + <artifactId>bow</artifactId> + <version>0.3-SNAPSHOT</version> - <dependencies> + <dependencies> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <version>1.4.3</version> - </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>1.4.3</version> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + <version>${wikittyVersion}</version> + </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc-impl</artifactId> + <version>${wikittyVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - <version>${wikitty.version}</version> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr-impl</artifactId> + <version>${wikittyVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-jdbc-impl</artifactId> - <version>${wikitty.version}</version> - </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.11</version> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-solr-impl</artifactId> - <version>${wikitty.version}</version> - </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.2.134</version> + </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.11</version> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.2.134</version> - </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.2.1</version> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>1.2.2</version> - </dependency> + <dependency> + <groupId>org.htmlparser</groupId> + <artifactId>htmlparser</artifactId> + <version>1.6</version> + </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.2.1</version> - </dependency> + </dependencies> - <dependency> - <groupId>org.htmlparser</groupId> - <artifactId>htmlparser</artifactId> - <version>1.6</version> - </dependency> + <scm> + <connection>scm:svn:http://svn.chorem.org/svn/bow/trunk</connection> + <developerConnection> + scm:svn:http://svn.chorem.org/svn/bow/trunk + </developerConnection> + <url>http://www.chorem.org/repositories/browse/bow/trunk</url> + </scm> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.5</version> - </dependency> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - </dependencies> + <name>bow</name> - <scm> - <connection>scm:svn:http://svn.chorem.org/svn/bow/trunk</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/bow/trunk</developerConnection> - <url>http://www.chorem.org/repositories/browse/bow/trunk</url> - </scm> + <description>bookmark on web</description> + <inceptionYear>2010</inceptionYear> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> - <name>bow</name> + <packaging>war</packaging> - <description>bookmark on web</description> - <inceptionYear>2010</inceptionYear> + <properties> + <platform>chorem.org</platform> + <projectId>bow</projectId> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <nuitonUtilsVersion>1.4.2</nuitonUtilsVersion> + <wikittyVersion>2.0</wikittyVersion> - <packaging>war</packaging> + <locales>en</locales> - <properties> - <!-- pour un muli module on doit fixer le projectId --> - <!--projectId>core-wikitty</projectId--> - <!--platform>nuiton.org</platform--> - <platform>chorem.org</platform> - <projectId>bow</projectId> - <wikitty.version>2.0</wikitty.version> - <!-- common versions used in sub-poms --> - <junit.version>4.8.1</junit.version> - <locales>en</locales> + <!-- license to use --> + <license.licenseName>gpl_v3</license.licenseName> - <!-- license to use --> - <license.licenseName>gpl_v3</license.licenseName> + </properties> - </properties> + <build> - <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> - <resources> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrstPluginVersion}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </pluginManagement> + <plugins> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>2.1</version> + <executions> + <execution> + <id>api generator</id> + <!-- + do not use the phase generate-XXX because it can be excecuted + several times... + --> + <phase>process-sources</phase> - <plugins> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <version>2.1</version> - <executions> - <execution> - <id>api generator</id> - <!-- - do not use the phase generate-XXX because it can be excecuted - several times... - --> - <phase>process-sources</phase> + <!--Configuration of model generator--> + <configuration> + <inputs> + <input>zargo</input> + </inputs> + <!--<addCompileDirectory>true</addCompileDirectory>--> + <!--<zargoResources>--> + <!--<input>${maven.src.dir}/main/xmi</input>--> + <!--</zargoResources>--> + <!--<xmiResources>--> + <!--<inputs>--> + <!--<input>${maven.gen.dir}/xmi</input>--> + <!--</inputs>--> + <!--</xmiResources>--> + <!--<includes>**/*.objectmodel</includes>--> + <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> + <templates>org.nuiton.wikitty.generator.WikittyMetaGenerator + </templates> + <!--<defaultPackage>com.jurismarches.vradi</defaultPackage>--> + <inputs>zargo</inputs> + <fullPackagePath>org.chorem.bow</fullPackagePath> + <!--<extractedPackages>org.chorem.bow</extractedPackages>--> + <generatedPackages>org.chorem.bow</generatedPackages> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> - <!--Configuration of model generator--> - <configuration> - <!--<addCompileDirectory>true</addCompileDirectory>--> - <zargoResources> - <input>${maven.src.dir}/main/xmi</input> - </zargoResources> - <xmiResources> - <inputs> - <input>${maven.gen.dir}/xmi</input> - </inputs> - </xmiResources> - <includes>**/*.objectmodel</includes> - <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> - <templates>org.nuiton.wikitty.generator.WikittyMetaGenerator</templates> - <!--<defaultPackage>com.jurismarches.vradi</defaultPackage>--> - <inputs>zargo</inputs> - <fullPackagePath>org.chorem.bow</fullPackagePath> - <extractedPackages>org.chorem.bow</extractedPackages> - <generatedPackages>org.chorem.bow</generatedPackages> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - </executions> + <dependencies> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-generators</artifactId> + <version>${wikittyVersion}</version> + </dependency> + </dependencies> - <dependencies> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-generators</artifactId> - <version>${wikitty.version}</version> - </dependency> - <!-- Meta model uml d'eclipse --> -<!-- <dependency> - <groupId>org.eclipse.uml2.uml</groupId> - <artifactId>resources</artifactId> - <version>2.1.0-v200706251652</version> - <exclusions> - <exclusion> - <groupId>org.eclipse.uml2</groupId> - <artifactId>uml</artifactId> - </exclusion> - </exclusions> - </dependency>--> - </dependencies> + </plugin> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - </plugins> - </build> + </plugins> + </build> </project>