Author: fdesbois Date: 2011-01-07 13:59:26 +0100 (Fri, 07 Jan 2011) New Revision: 43 Url: http://nuiton.org/repositories/revision/nuiton-web/43 Log: Improve dependencies Modified: trunk/nuiton-tapestry/pom.xml trunk/pom.xml Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-01-07 12:39:32 UTC (rev 42) +++ trunk/nuiton-tapestry/pom.xml 2011-01-07 12:59:26 UTC (rev 43) @@ -25,8 +25,8 @@ </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> </dependency> <dependency> @@ -35,6 +35,16 @@ </dependency> <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-ioc</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry5-annotations</artifactId> + </dependency> + + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-07 12:39:32 UTC (rev 42) +++ trunk/pom.xml 2011-01-07 12:59:26 UTC (rev 43) @@ -28,13 +28,8 @@ <dependencies> + <!-- Tapestry --> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> - </dependency> - - <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-core</artifactId> <version>${tapestryVersion}</version> @@ -47,23 +42,18 @@ </dependency> <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - <version>${jdomVersion}</version> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-ioc</artifactId> + <version>${tapestryVersion}</version> </dependency> <dependency> - <groupId>rome</groupId> - <artifactId>rome</artifactId> - <version>${romeVersion}</version> - <exclusions> - <exclusion> - <groupId>jdom</groupId> - <artifactId>jdom</artifactId> - </exclusion> - </exclusions> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry5-annotations</artifactId> + <version>${tapestryVersion}</version> </dependency> + <!-- sl4j dependencies --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -76,10 +66,30 @@ <scope>runtime</scope> </dependency> + <!-- RSS --> <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.1</version> + </dependency> + + <dependency> + <groupId>rome</groupId> + <artifactId>rome</artifactId> + <version>0.9</version> + <exclusions> + <exclusion> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + </exclusion> + </exclusions> + </dependency> + + <!--Provided--> + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>${servletVersion}</version> + <version>2.5</version> <scope>provided</scope> </dependency> @@ -137,12 +147,6 @@ <tapestryVersion>5.2.4</tapestryVersion> <slf4jVersion>1.6.1</slf4jVersion> - <!-- RSS --> - <romeVersion>0.9</romeVersion> - <jdomVersion>1.1</jdomVersion> - - <servletVersion>2.5</servletVersion> - <!--Multilanguage maven-site --> <siteLocales>en,fr</siteLocales>