You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by po...@apache.org on 2016/12/29 22:19:29 UTC

[2/3] incubator-tamaya-sandbox git commit: Fix build warnings about double mockito versions.

Fix build warnings about double mockito versions.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/5a525bdf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/5a525bdf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/5a525bdf

Branch: refs/heads/master
Commit: 5a525bdf83e5d76ca311bb67e3052163a2606499
Parents: 568483e
Author: Phil Ottlinger <po...@apache.org>
Authored: Thu Dec 29 23:11:59 2016 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Thu Dec 29 23:11:59 2016 +0100

----------------------------------------------------------------------
 pom.xml | 15 ---------------
 1 file changed, 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5a525bdf/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9d5b629..f9585e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,6 @@ under the License.
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
         <version>18</version>
-        <relativePath>org.apache:apache</relativePath>
     </parent>
     <groupId>org.apache.tamaya.ext</groupId>
     <artifactId>tamaya-sandbox</artifactId>
@@ -300,20 +299,6 @@ under the License.
             </dependency>
 
             <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-core</artifactId>
-                <version>${mockito.version}</version>
-                <scope>test</scope>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.hamcrest</groupId>
-                        <artifactId>hamcrest-core</artifactId>
-                    </exclusion>
-                </exclusions>
-
-            </dependency>
-
-            <dependency>
                 <groupId>rubygems</groupId>
                 <artifactId>asciidoctor-diagram</artifactId>
                 <version>${asciidoctor-diagramm.version}</version>