Author: gmazza
Date: Wed Jan 7 01:09:13 2015
New Revision: 1649983
URL: http://svn.apache.org/r1649983
Log:
Dependencies updated to the latest except for Struts, which is incurring some
JSP compilation error over the style attribute within Struts tags when trying
to upgrade from Struts 2.3.16 to 2.3.20. mvn jetty:run is working again (run
from the app folder as usual).
Modified:
roller/trunk/app/pom.xml
roller/trunk/pom.xml
Modified: roller/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1649983&r1=1649982&r2=1649983&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Wed Jan 7 01:09:13 2015
@@ -16,8 +16,8 @@
<packaging>war</packaging>
<properties>
- <lucene.version>4.10.0</lucene.version>
- <spring.version>4.1.0.RELEASE</spring.version>
+ <lucene.version>4.10.3</lucene.version>
+ <spring.version>4.1.4.RELEASE</spring.version>
<spring.security.version>3.2.5.RELEASE</spring.security.version>
</properties>
@@ -183,7 +183,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.7</version>
+ <version>1.7.10</version>
<scope>runtime</scope>
</dependency>
@@ -314,7 +314,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.9</version>
+ <version>1.10</version>
</dependency>
<!-- test deps -->
@@ -356,7 +356,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
<configuration>
<attachClasses>true</attachClasses>
</configuration>
@@ -389,6 +389,11 @@
<artifactId>derbyclient</artifactId>
<version>${derby.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.7</version>
+ </dependency>
</dependencies>
</plugin>
@@ -400,7 +405,7 @@
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
<configuration>
<server>myTomcat</server>
<path>/${project.build.finalName}</path>
Modified: roller/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=1649983&r1=1649982&r2=1649983&view=diff
==============================================================================
--- roller/trunk/pom.xml (original)
+++ roller/trunk/pom.xml Wed Jan 7 01:09:13 2015
@@ -61,7 +61,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.2.3.v20140905</version>
+ <version>9.2.6.v20141205</version>
</plugin>
<plugin>
<groupId>com.btmatthews.maven.plugins.inmemdb</groupId>
@@ -81,7 +81,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
+ <version>4.12</version>
</dependency>
</dependencies>
</dependencyManagement>
