Author: hlship
Date: Wed Oct 27 22:43:38 2010
New Revision: 1028129
URL: http://svn.apache.org/viewvc?rev=1028129&view=rev
Log:
TAP5-1327: Upgrade SL4J dependency to 1.6.1
Modified:
tapestry/tapestry5/trunk/pom.xml
tapestry/tapestry5/trunk/tapestry-beanvalidator/pom.xml
tapestry/tapestry5/trunk/tapestry-ioc/pom.xml
Modified: tapestry/tapestry5/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/pom.xml?rev=1028129&r1=1028128&r2=1028129&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/pom.xml (original)
+++ tapestry/tapestry5/trunk/pom.xml Wed Oct 27 22:43:38 2010
@@ -182,6 +182,8 @@
<module>tapestry-ioc</module>
<module>tapestry-annotations</module>
<module>tapestry-core</module>
+ <module>tapestry-beanvalidator</module>
+ <module>tapestry-jmx</module>
<!-- Integrations -->
<module>tapestry-spring</module>
<module>tapestry-hibernate-core</module>
@@ -193,11 +195,6 @@
<module>tapestry-component-report</module>
<!-- Tutorials -->
<module>tapestry-tutorial1</module>
- <!-- Temporarily removed until 5.2
- <module>tapestry-webflow</module>
- -->
- <module>tapestry-beanvalidator</module>
- <module>tapestry-jmx</module>
</modules>
<dependencyManagement>
<dependencies>
Modified: tapestry/tapestry5/trunk/tapestry-beanvalidator/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-beanvalidator/pom.xml?rev=1028129&r1=1028128&r2=1028129&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-beanvalidator/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-beanvalidator/pom.xml Wed Oct 27 22:43:38
2010
@@ -2,7 +2,6 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-beanvalidator</artifactId>
- <version>5.2.3-SNAPSHOT</version>
<name>Tapestry/JSR-303 Integration Library</name>
<description>
Provides support for bean validation
@@ -16,26 +15,29 @@
<url />
<dependencies>
-
+ <!-- For some reason, Maven 2.2.1 keeps reverting to the 1.5.6
version. -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-core</artifactId>
<type>jar</type>
- <optional>false</optional>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<type>jar</type>
<scope>provided</scope>
- <optional>false</optional>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>1.0.0.GA</version>
<type>jar</type>
- <optional>false</optional>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
@@ -43,19 +45,16 @@
<version>4.0.0.GA</version>
<type>jar</type>
<scope>test</scope>
- <optional>false</optional>
</dependency>
<dependency>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-test</artifactId>
<type>jar</type>
- <optional>false</optional>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<type>jar</type>
- <optional>false</optional>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
@@ -63,7 +62,6 @@
<version>2.2.2</version>
<type>jar</type>
<scope>test</scope>
- <optional>false</optional>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -71,7 +69,6 @@
<version>1.2.14</version>
<type>jar</type>
<scope>test</scope>
- <optional>false</optional>
</dependency>
</dependencies>
Modified: tapestry/tapestry5/trunk/tapestry-ioc/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/pom.xml?rev=1028129&r1=1028128&r2=1028129&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/pom.xml Wed Oct 27 22:43:38 2010
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.2</version>
+ <version>1.6.1</version>
</dependency>
<!-- SLF4J now supports earlier versions of Log4J more cleanly, but
still nice to include
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.2</version>
+ <version>1.6.1</version>
</dependency>
