Quellcode durchsuchen

Fix Mockito/Hamcrest build classpath conflict

* Fixes issue with Mockito classes not found on the vaadin-client test classpath
* Fixes Mockito/Hamcrest dependency conflict described in
       https://tedvinke.wordpress.com/2013/12/17/mixing-junit-hamcrest-and-mockito-explaining-nosuchmethoderror/

Reapplying after dependency leaking from root project to bom module has been fixed.

Change-Id: I0f2f368ccc6acb303f693aa34ace9e893ab7b573
tags/8.0.0.alpha5
John Ahlroos vor 7 Jahren
Ursprung
Commit
8b2de181c3
2 geänderte Dateien mit 19 neuen und 2 gelöschten Zeilen
  1. 5
    0
      client/pom.xml
  2. 14
    2
      pom.xml

+ 5
- 0
client/pom.xml Datei anzeigen

<groupId>com.google.gwt</groupId> <groupId>com.google.gwt</groupId>
<artifactId>gwt-elemental</artifactId> <artifactId>gwt-elemental</artifactId>
</dependency> </dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
</dependencies> </dependencies>


<build> <build>

+ 14
- 2
pom.xml Datei anzeigen

<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.12</version> <version>4.12</version>
<exclusions>
<exclusion>
<artifactId>hamcrest-core</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.easymock</groupId> <groupId>org.easymock</groupId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<artifactId>mockito-core</artifactId>
<version>1.9.5</version> <version>1.9.5</version>
<exclusions>
<exclusion>
<artifactId>hamcrest-core</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<artifactId>mockito-core</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

Laden…
Abbrechen
Speichern