Author: bpoussin Date: 2010-10-29 19:03:00 +0200 (Fri, 29 Oct 2010) New Revision: 464 Url: http://nuiton.org/repositories/revision/wikitty/464 Log: change version to 3.0-SNAPSHOT check all dependency with mvn -Panalyze-dependencies Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hbase-impl/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc-impl/pom.xml trunk/wikitty-jms-impl/pom.xml trunk/wikitty-jpa-impl/pom.xml 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-10-29 15:41:32 UTC (rev 463) +++ trunk/pom.xml 2010-10-29 17:03:00 UTC (rev 464) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.3-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> <modules> @@ -137,6 +137,20 @@ </dependency> <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-solrj</artifactId> + <version>1.4.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + <version>2.9.3</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.5</version> @@ -201,6 +215,13 @@ <dependency> <groupId>jivesoftware</groupId> + <artifactId>smack</artifactId> + <version>3.1.0</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>jivesoftware</groupId> <artifactId>smackx</artifactId> <version>3.1.0</version> <scope>compile</scope> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-10-29 15:41:32 UTC (rev 463) +++ trunk/wikitty-api/pom.xml 2010-10-29 17:03:00 UTC (rev 464) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.3-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <!-- ************************************************************* --> @@ -40,12 +40,6 @@ <scope>test</scope> </dependency> - <!-- TEST --> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <!-- COMPILE --> <dependency> <groupId>org.picocontainer</groupId> @@ -110,11 +104,16 @@ <artifactId>jgroups</artifactId> </dependency> - <dependency> - <groupId>jivesoftware</groupId> - <artifactId>smackx</artifactId> - </dependency> + <dependency> + <groupId>jivesoftware</groupId> + <artifactId>smack</artifactId> + </dependency> + <dependency> + <groupId>jivesoftware</groupId> + <artifactId>smackx</artifactId> + </dependency> + </dependencies> <!-- ************************************************************* --> Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2010-10-29 15:41:32 UTC (rev 463) +++ trunk/wikitty-generators/pom.xml 2010-10-29 17:03:00 UTC (rev 464) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.3-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <!-- ************************************************************* --> @@ -22,6 +22,10 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> </dependency> Modified: trunk/wikitty-hbase-impl/pom.xml =================================================================== --- trunk/wikitty-hbase-impl/pom.xml 2010-10-29 15:41:32 UTC (rev 463) +++ trunk/wikitty-hbase-impl/pom.xml 2010-10-29 17:03:00 UTC (rev 464) @@ -8,7 +8,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <!-- ************************************************************* --> Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2010-10-29 15:41:32 UTC (rev 463) +++ trunk/wikitty-hessian-client/pom.xml 2010-10-29 17:03:00 UTC (rev 464) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.3-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <!-- ************************************************************* --> @@ -38,5 +38,4 @@ <description>Wikitty hessian client</description> <inceptionYear>2010</inceptionYear> - </project> Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2010-10-29 15:41:32 UTC (rev 463) +++ trunk/wikitty-hessian-server/pom.xml 2010-10-29 17:03:00 UTC (rev 464) @@ -39,6 +39,10 @@ </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + <dependency> <groupId>com.caucho</groupId> <artifactId>hessian</artifactId> </dependency> @@ -69,8 +73,7 @@ <inceptionYear>2010</inceptionYear> <packaging>war</packaging> - - <properties> + <properties> <!-- extra files to include in release --> <redmine.releaseFiles>target/${project.build.finalName}.${project.packaging}</redmine.releaseFiles> </properties> Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2010-10-29 15:41:32 UTC (rev 463) +++ trunk/wikitty-jdbc-impl/pom.xml 2010-10-29 17:03:00 UTC (rev 464) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.3-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> @@ -63,10 +63,6 @@ </dependency> <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3</artifactId> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> @@ -78,12 +74,27 @@ <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> </dependency> + <dependency> + <groupId>jboss.jbossts</groupId> + <artifactId>jbossjta</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> </dependency> @@ -95,6 +106,5 @@ <name>Wikitty :: wikitty-jdbc-impl</name> <description>Wikitty jdbc storage</description> <inceptionYear>2009</inceptionYear> - </project> Modified: trunk/wikitty-jms-impl/pom.xml =================================================================== --- trunk/wikitty-jms-impl/pom.xml 2010-10-29 15:41:32 UTC (rev 463) +++ trunk/wikitty-jms-impl/pom.xml 2010-10-29 17:03:00 UTC (rev 464) @@ -7,7 +7,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-jpa-impl/pom.xml =================================================================== --- trunk/wikitty-jpa-impl/pom.xml 2010-10-29 15:41:32 UTC (rev 463) +++ trunk/wikitty-jpa-impl/pom.xml 2010-10-29 17:03:00 UTC (rev 464) @@ -8,7 +8,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <!-- ************************************************************* --> Modified: trunk/wikitty-multistorage-impl/pom.xml =================================================================== --- trunk/wikitty-multistorage-impl/pom.xml 2010-10-29 15:41:32 UTC (rev 463) +++ trunk/wikitty-multistorage-impl/pom.xml 2010-10-29 17:03:00 UTC (rev 464) @@ -7,7 +7,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-solr-impl/pom.xml =================================================================== --- trunk/wikitty-solr-impl/pom.xml 2010-10-29 15:41:32 UTC (rev 463) +++ trunk/wikitty-solr-impl/pom.xml 2010-10-29 17:03:00 UTC (rev 464) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.3-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <!-- ************************************************************* --> @@ -32,15 +32,38 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>jboss.jbossts</groupId> + <artifactId>jbossjta</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + <!-- SOLR --> <dependency> <groupId>org.apache.solr</groupId> <artifactId>solr-core</artifactId> </dependency> + <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-solrj</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + </dependency> + + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> + <scope>runtime</scope> </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> @@ -50,10 +73,6 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> <!-- TEST --> <dependency> @@ -71,6 +90,5 @@ <description>Wikiity solr search engine</description> <inceptionYear>2009</inceptionYear> - </project> Modified: trunk/wikitty-ui-zk/pom.xml =================================================================== --- trunk/wikitty-ui-zk/pom.xml 2010-10-29 15:41:32 UTC (rev 463) +++ trunk/wikitty-ui-zk/pom.xml 2010-10-29 17:03:00 UTC (rev 464) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.3-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <!-- ************************************************************* --> @@ -52,16 +52,16 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <scope>compile</scope> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> </dependency> + <!-- <dependency> <groupId>jasperreports</groupId> <artifactId>jasperreports</artifactId> @@ -116,8 +116,7 @@ <!-- ************************************************************* --> <packaging>war</packaging> - - <properties> + <properties> <!-- extra files to include in release --> <redmine.releaseFiles>target/${project.build.finalName}.${project.packaging}</redmine.releaseFiles> </properties>