Author: brianm
Date: Sun Dec 14 17:39:05 2008
New Revision: 726598
URL: http://svn.apache.org/viewvc?rev=726598&view=rev
Log:
merge Matthias Bogaert's patch fir SHINDIG-784, updating library versions,
from trunk to the 1.0.x branch
Modified:
incubator/shindig/branches/1.0.x-incubating/ (props changed)
incubator/shindig/branches/1.0.x-incubating/pom.xml
Propchange: incubator/shindig/branches/1.0.x-incubating/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 14 17:39:05 2008
@@ -1 +1 @@
-/incubator/shindig/trunk:724511-724522,724874,724915
+/incubator/shindig/trunk:724511-724522,724874,724915,726597
Modified: incubator/shindig/branches/1.0.x-incubating/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/pom.xml?rev=726598&r1=726597&r2=726598&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/pom.xml Sun Dec 14 17:39:05 2008
@@ -680,7 +680,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.9</version>
+ <version>6.1.14</version>
</plugin>
<!-- set versions of common plugins for reproducibility, ordered
alphabetically -->
@@ -715,7 +715,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -739,7 +739,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4.3</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -856,7 +856,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.4</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -868,13 +868,13 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
- <version>2.2.2</version>
+ <version>2.4</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -955,7 +955,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -977,12 +977,12 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>6.1.9</version>
+ <version>6.1.14</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>1.5.2</version>
+ <version>1.6</version>
</dependency>
<dependency>
<groupId>rome</groupId>
@@ -1027,7 +1027,7 @@
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0</version>
</dependency>
<dependency>
<groupId>findbugs</groupId>
