Author: cziegeler
Date: Mon Jan 4 06:27:32 2016
New Revision: 1722789
URL: http://svn.apache.org/viewvc?rev=1722789&view=rev
Log:
Update to latest powermock/mockito
Modified:
sling/trunk/bundles/extensions/i18n/pom.xml
Modified: sling/trunk/bundles/extensions/i18n/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/i18n/pom.xml?rev=1722789&r1=1722788&r2=1722789&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/i18n/pom.xml (original)
+++ sling/trunk/bundles/extensions/i18n/pom.xml Mon Jan 4 06:27:32 2016
@@ -169,13 +169,9 @@
<version>2.4.0</version>
<scope>provided</scope>
</dependency>
-
- <!-- Version needs to be overwritten for SLING-3954
- Can be removed once we update to a new parent pom (>22) -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.9.10</version>
</dependency>
<!-- Testing -->
@@ -201,19 +197,19 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.9.5</version>
+ <version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
- <version>1.5.5</version>
+ <version>1.6.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
- <version>1.5.5</version>
+ <version>1.6.4</version>
<scope>test</scope>
</dependency>
<dependency>