[Wikitty-commits] r198 - in trunk: . wikitty-api wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc-impl wikitty-multistorage-impl wikitty-solr-impl wikitty-ui-zk

Author: tchemit Date: 2010-07-21 12:31:41 +0200 (Wed, 21 Jul 2010) New Revision: 198 Url: http://nuiton.org/repositories/revision/wikitty/198 Log: use dependencies manager + use sibling dependencies Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc-impl/pom.xml trunk/wikitty-multistorage-impl/ trunk/wikitty-multistorage-impl/pom.xml trunk/wikitty-solr-impl/pom.xml trunk/wikitty-ui-zk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-21 10:15:51 UTC (rev 197) +++ trunk/pom.xml 2010-07-21 10:31:41 UTC (rev 198) @@ -24,6 +24,7 @@ <module>wikitty-api</module> <module>wikitty-solr-impl</module> <module>wikitty-jdbc-impl</module> + <module>wikitty-multistorage-impl</module> <module>wikitty-ui-zk</module> <module>wikitty-hessian-client</module> @@ -103,6 +104,91 @@ <scope>compile</scope> </dependency> + <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-core</artifactId> + <version>1.4.0</version> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>1.3</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>jasperreports</groupId> + <artifactId>jasperreports</artifactId> + <version>3.5.3</version> + </dependency> + + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + <version>1.1.4c</version> + </dependency> + + <dependency> + <groupId>net.sf.opencsv</groupId> + <artifactId>opencsv</artifactId> + <version>2.1</version> + <scope>compile</scope> + </dependency> + + <!-- JTA --> + <dependency> + <groupId>jboss.jbossts</groupId> + <artifactId>jbossjta</artifactId> + <version>4.9.0.GA</version> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + </dependency> + + <!-- Cache --> + <dependency> + <groupId>jgroups</groupId> + <artifactId>jgroups</artifactId> + <version>2.9.0.GA</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>com.experlog</groupId> + <artifactId>xapool</artifactId> + <version>1.5.0</version> + </dependency> + + + <dependency> + <groupId>org.zkoss.zk</groupId> + <artifactId>zk</artifactId> + <version>${zk.version}</version> + </dependency> + + <dependency> + <groupId>org.zkoss.zk</groupId> + <artifactId>zkplus</artifactId> + <version>${zk.version}</version> + </dependency> + + <dependency> + <groupId>org.zkoss.zk</groupId> + <artifactId>zul</artifactId> + <version>${zk.version}</version> + </dependency> + + </dependencies> </dependencyManagement> @@ -137,6 +223,7 @@ <spring.version>3.0.1.RELEASE</spring.version> <jetty.version>6.1.22</jetty.version> + <zk.version>5.0.2</zk.version> </properties> <!-- ************************************************************* --> @@ -157,6 +244,13 @@ </dependency> </dependencies> </plugin> + + <!-- processor plugin --> + <plugin> + <groupId>org.nuiton.processor</groupId> + <artifactId>maven-processor-plugin</artifactId> + <version>1.0.3</version> + </plugin> </plugins> </pluginManagement> @@ -169,7 +263,6 @@ <module>wikitty-hbase-impl</module> <module>wikitty-jpa-impl</module> <module>wikitty-jms-impl</module> - <module>wikitty-multistorage-impl</module> </modules> </profile> </profiles> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-07-21 10:15:51 UTC (rev 197) +++ trunk/wikitty-api/pom.xml 2010-07-21 10:31:41 UTC (rev 198) @@ -68,43 +68,34 @@ </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> <groupId>xpp3</groupId> <artifactId>xpp3</artifactId> - <version>1.1.4c</version> </dependency> <dependency> <groupId>net.sf.opencsv</groupId> <artifactId>opencsv</artifactId> - <version>2.1</version> - <scope>compile</scope> </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>1.3</version> - <scope>compile</scope> - </dependency> - <!-- JTA --> <dependency> <groupId>jboss.jbossts</groupId> <artifactId>jbossjta</artifactId> - <version>4.9.0.GA</version> </dependency> <dependency> <groupId>javax.transaction</groupId> <artifactId>jta</artifactId> - <version>1.1</version> </dependency> <!-- Cache --> <dependency> <groupId>jgroups</groupId> <artifactId>jgroups</artifactId> - <version>2.9.0.GA</version> - <scope>compile</scope> </dependency> </dependencies> Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2010-07-21 10:15:51 UTC (rev 197) +++ trunk/wikitty-generators/pom.xml 2010-07-21 10:31:41 UTC (rev 198) @@ -47,7 +47,6 @@ <plugin> <groupId>org.nuiton.processor</groupId> <artifactId>maven-processor-plugin</artifactId> - <version>1.0.3</version> <executions> <execution> <phase>generate-sources</phase> Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2010-07-21 10:15:51 UTC (rev 197) +++ trunk/wikitty-hessian-client/pom.xml 2010-07-21 10:31:41 UTC (rev 198) @@ -1,43 +1,44 @@ <?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> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>wikitty</artifactId> - <version>2.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>2.0-SNAPSHOT</version> + </parent> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-hessian-client</artifactId> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-hessian-client</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>com.caucho</groupId> - <artifactId>hessian</artifactId> - <version>3.1.5</version> - <scope>compile</scope> - </dependency> - </dependencies> + <dependency> + <groupId>com.caucho</groupId> + <artifactId>hessian</artifactId> + <scope>compile</scope> + </dependency> + </dependencies> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - <name>Wikitty :: hessian client</name> + <name>Wikitty :: hessian client</name> - <description>Wikitty hessian client</description> - <inceptionYear>2010</inceptionYear> + <description>Wikitty hessian client</description> + <inceptionYear>2010</inceptionYear> </project> Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2010-07-21 10:15:51 UTC (rev 197) +++ trunk/wikitty-hessian-server/pom.xml 2010-07-21 10:31:41 UTC (rev 198) @@ -19,7 +19,7 @@ <dependencies> <dependency> - <groupId>org.nuiton.wikitty</groupId> + <groupId>${project.groupId}</groupId> <artifactId>wikitty-api</artifactId> <version>${project.version}</version> <scope>compile</scope> @@ -33,13 +33,13 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>org.nuiton.wikitty</groupId> + <groupId>${project.groupId}</groupId> <artifactId>wikitty-multistorage-impl</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.nuiton.wikitty</groupId> + <groupId>${project.groupId}</groupId> <artifactId>wikitty-solr-impl</artifactId> <version>${project.version}</version> <scope>compile</scope> @@ -47,8 +47,6 @@ <dependency> <groupId>com.caucho</groupId> <artifactId>hessian</artifactId> - <version>3.1.5</version> - <scope>compile</scope> </dependency> </dependencies> Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2010-07-21 10:15:51 UTC (rev 197) +++ trunk/wikitty-jdbc-impl/pom.xml 2010-07-21 10:31:41 UTC (rev 198) @@ -68,7 +68,6 @@ <dependency> <groupId>xpp3</groupId> <artifactId>xpp3</artifactId> - <version>1.1.4c</version> </dependency> <dependency> <groupId>commons-logging</groupId> @@ -86,7 +85,6 @@ <dependency> <groupId>com.experlog</groupId> <artifactId>xapool</artifactId> - <version>1.5.0</version> </dependency> </dependencies> Property changes on: trunk/wikitty-multistorage-impl ___________________________________________________________________ Modified: svn:ignore - .settings target .classpath .project *.ipr *.iml *.iws + *.ipr *.iws .classpath .project target .settings *.ipr *.iws *.iml Modified: trunk/wikitty-multistorage-impl/pom.xml =================================================================== --- trunk/wikitty-multistorage-impl/pom.xml 2010-07-21 10:15:51 UTC (rev 197) +++ trunk/wikitty-multistorage-impl/pom.xml 2010-07-21 10:31:41 UTC (rev 198) @@ -1,99 +1,102 @@ <?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"> - <modelVersion>4.0.0</modelVersion> +<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> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>wikitty</artifactId> - <version>2.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>2.0-SNAPSHOT</version> + </parent> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-multistorage-impl</artifactId> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-multistorage-impl</artifactId> - <dependencies> - <!-- WIKITTY --> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>wikitty-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>wikitty-solr-impl</artifactId> - <version>${project.version}</version> - </dependency> + <dependencies> + <!-- WIKITTY --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-solr-impl</artifactId> + <version>${project.version}</version> + </dependency> - <!-- TEST --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> + <!-- TEST --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>wikitty-jdbc-impl</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>wikitty-jms-impl</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - </dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-jdbc-impl</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <!-- not used actually --> + <!--dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-jms-impl</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency--> + </dependencies> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - <name>Wikitty :: wikitty-multistorage-impl</name> - <description>manage multi storage</description> - <inceptionYear>2010</inceptionYear> + <name>Wikitty :: wikitty-multistorage-impl</name> + <description>manage multi storage</description> + <inceptionYear>2010</inceptionYear> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> - <packaging>jar</packaging> + <packaging>jar</packaging> - <properties> - <!-- maven conventionnal variables doesn't work ? - <maven.test.failure.ignore>true</maven.test.failure.ignore> --> - <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore> - </properties> + <properties> + <!-- maven conventionnal variables doesn't work ? + <maven.test.failure.ignore>true</maven.test.failure.ignore> --> + <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore> + </properties> - <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*</include> - </includes> - </testResource> - </testResources> + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*</include> + </includes> + </testResource> + </testResources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemPropertyVariables> - <solr.data.dir>${project.build.directory}/solr</solr.data.dir> - </systemPropertyVariables> - </configuration> - </plugin> - </plugins> - </build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemPropertyVariables> + <solr.data.dir>${project.build.directory}/solr</solr.data.dir> + </systemPropertyVariables> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: trunk/wikitty-solr-impl/pom.xml =================================================================== --- trunk/wikitty-solr-impl/pom.xml 2010-07-21 10:15:51 UTC (rev 197) +++ trunk/wikitty-solr-impl/pom.xml 2010-07-21 10:31:41 UTC (rev 198) @@ -31,13 +31,10 @@ <dependency> <groupId>org.apache.solr</groupId> <artifactId>solr-core</artifactId> - <version>1.4.0</version> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> Modified: trunk/wikitty-ui-zk/pom.xml =================================================================== --- trunk/wikitty-ui-zk/pom.xml 2010-07-21 10:15:51 UTC (rev 197) +++ trunk/wikitty-ui-zk/pom.xml 2010-07-21 10:31:41 UTC (rev 198) @@ -20,13 +20,13 @@ <dependencies> <dependency> - <groupId>org.nuiton.wikitty</groupId> + <groupId>${project.groupId}</groupId> <artifactId>wikitty-api</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.nuiton.wikitty</groupId> + <groupId>${project.groupId}</groupId> <artifactId>wikitty-jdbc-impl</artifactId> <version>${project.version}</version> </dependency> @@ -60,20 +60,17 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>1.3</version> <scope>compile</scope> </dependency> <dependency> <groupId>jasperreports</groupId> <artifactId>jasperreports</artifactId> - <version>3.5.3</version> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> <scope>provided</scope> </dependency> @@ -92,19 +89,16 @@ <dependency> <groupId>org.zkoss.zk</groupId> <artifactId>zk</artifactId> - <version>5.0.2</version> </dependency> <dependency> <groupId>org.zkoss.zk</groupId> <artifactId>zkplus</artifactId> - <version>5.0.2</version> </dependency> <dependency> <groupId>org.zkoss.zk</groupId> <artifactId>zul</artifactId> - <version>5.0.2</version> </dependency> </dependencies>