Repository: maven-scm Updated Branches: refs/heads/master b273f796b -> 3b4695a81
[SCM-767] Corrected mockito' scope at accurev provider. Promote mockito to dependencyManagement to be reused by other providers Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/3b4695a8 Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/3b4695a8 Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/3b4695a8 Branch: refs/heads/master Commit: 3b4695a81d97271a7b13ed64cc50103d9a73e20b Parents: b273f79 Author: dantran <dant...@gmail.com> Authored: Sat Jul 26 10:22:10 2014 -0700 Committer: dantran <dant...@gmail.com> Committed: Sat Jul 26 10:22:10 2014 -0700 ---------------------------------------------------------------------- maven-scm-providers/maven-scm-provider-accurev/pom.xml | 7 +++---- maven-scm-providers/maven-scm-provider-jazz/pom.xml | 2 +- .../maven-scm-provider-svnexe/pom.xml | 5 ++--- pom.xml | 13 +++++++++---- 4 files changed, 15 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-scm/blob/3b4695a8/maven-scm-providers/maven-scm-provider-accurev/pom.xml ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-accurev/pom.xml b/maven-scm-providers/maven-scm-provider-accurev/pom.xml index 7916097..d4c5077 100644 --- a/maven-scm-providers/maven-scm-provider-accurev/pom.xml +++ b/maven-scm-providers/maven-scm-provider-accurev/pom.xml @@ -45,8 +45,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.8.5</version> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> @@ -68,8 +67,8 @@ <goals> <goal>generate-metadata</goal> </goals> - </execution> - </executions> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/maven-scm/blob/3b4695a8/maven-scm-providers/maven-scm-provider-jazz/pom.xml ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-jazz/pom.xml b/maven-scm-providers/maven-scm-provider-jazz/pom.xml index d97d606..97a7a9f 100644 --- a/maven-scm-providers/maven-scm-provider-jazz/pom.xml +++ b/maven-scm-providers/maven-scm-provider-jazz/pom.xml @@ -52,7 +52,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>1.9.0</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.maven.scm</groupId> http://git-wip-us.apache.org/repos/asf/maven-scm/blob/3b4695a8/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml index 96db831..f088ee2 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml @@ -58,7 +58,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>1.9.5</version> <scope>test</scope> </dependency> </dependencies> @@ -75,8 +74,8 @@ <goals> <goal>generate-metadata</goal> </goals> - </execution> - </executions> + </execution> + </executions> </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/maven-scm/blob/3b4695a8/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d75aab0..dd8d8fc 100644 --- a/pom.xml +++ b/pom.xml @@ -278,6 +278,11 @@ <version>4.8.2</version> </dependency> <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.9.5</version> + </dependency> + <dependency> <groupId>org.apache.maven.scm</groupId> <artifactId>maven-scm-provider-svntest</artifactId> <version>${project.version}</version> @@ -582,7 +587,7 @@ </plugins> </build> </profile> - + <profile> <id>apache-release</id> <build> @@ -608,7 +613,7 @@ </profile> </profiles> - + <repositories> <repository> <id>apache.snapshots</id> @@ -620,6 +625,6 @@ <enabled>true</enabled> </snapshots> </repository> - </repositories> - + </repositories> + </project>
