iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8784 from dupirefr/team/JAVA-131-hamcrest_version_update

Browse Source 
[JAVA-131] Updated hamcrest version from 1.3 to 2.2
This commit is contained in:
Josh Cummings
2020-03-07 14:12:21 -07:00
committed by GitHub
parent aa3f05a178 bc2c937183
commit 3cd2cf7cd1
21 changed files with 35 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cdi/pom.xml
+2 -2
View File
@@ -26,8 +26,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId> <artifactId>hamcrest</artifactId>
<version>${org.hamcrest.version}</version> <version>${hamcrest.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
core-java-modules/core-java-string-conversions-2/pom.xml
+2 -2
View File
@@ -28,8 +28,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId> <artifactId>hamcrest</artifactId>
<version>${org.hamcrest.version}</version> <version>${hamcrest.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
core-java-modules/core-java-string-conversions/pom.xml
+2 -2
View File
@@ -44,8 +44,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId> <artifactId>hamcrest</artifactId>
<version>${org.hamcrest.version}</version> <version>${hamcrest.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
core-java-modules/core-java-string-operations-2/pom.xml
+2 -2
View File
@@ -48,8 +48,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId> <artifactId>hamcrest</artifactId>
<version>${org.hamcrest.version}</version> <version>${hamcrest.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
ethereum/pom.xml
+2 -2
View File
@@ -159,8 +159,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId> <artifactId>hamcrest</artifactId>
<version>${org.hamcrest.version}</version> <version>${hamcrest.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
pom.xml
+5 -11
View File
@@ -59,20 +59,14 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId> <artifactId>hamcrest</artifactId>
<version>${org.hamcrest.version}</version> <version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>${org.hamcrest.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId> <artifactId>hamcrest-all</artifactId>
<version>${org.hamcrest.version}</version> <version>${hamcrest-all.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@@ -1334,7 +1328,8 @@
<gib.enabled>false</gib.enabled> <gib.enabled>false</gib.enabled>
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
<org.hamcrest.version>1.3</org.hamcrest.version> <hamcrest.version>2.2</hamcrest.version>
<hamcrest-all.version>1.3</hamcrest-all.version>
<mockito.version>2.21.0</mockito.version> <mockito.version>2.21.0</mockito.version>
<!-- logging --> <!-- logging -->
@@ -1352,7 +1347,6 @@
<esapi.version>2.1.0.1</esapi.version> <esapi.version>2.1.0.1</esapi.version>
<jmh-core.version>1.19</jmh-core.version> <jmh-core.version>1.19</jmh-core.version>
<jmh-generator.version>1.19</jmh-generator.version> <jmh-generator.version>1.19</jmh-generator.version>
<hamcrest-all.version>1.3</hamcrest-all.version>
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version> <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
<maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version> <maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
<commons-io.version>2.5</commons-io.version> <commons-io.version>2.5</commons-io.version>
spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml
+3 -3
View File
@@ -65,14 +65,14 @@
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId> <artifactId>hamcrest-core</artifactId>
<version>${hamcrest.version}</version> <version>${hamcrest-core.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<properties> <properties>
<spring-cloud-starter-feign.version>1.2.5.RELEASE</spring-cloud-starter-feign.version> <spring-cloud-starter-feign.version>1.2.5.RELEASE</spring-cloud-starter-feign.version>
<hamcrest.version>1.3</hamcrest.version> <hamcrest-core.version>1.3</hamcrest-core.version>
</properties> </properties>
</project> </project>
spring-cloud/spring-cloud-zuul/spring-zuul-ui/pom.xml
+1 -6
View File
@@ -24,12 +24,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId> <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
spring-core-2/pom.xml
+1 -6
View File
@@ -135,12 +135,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId> <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
spring-rest-query-language/pom.xml
+1 -7
View File
@@ -206,15 +206,9 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- <dependency> -->
<!-- <groupId>org.hamcrest</groupId> -->
<!-- <artifactId>hamcrest-core</artifactId> -->
<!-- <scope>test</scope> -->
<!-- </dependency> -->
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId> <artifactId>hamcrest</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
spring-rest-simple/pom.xml
+1 -6
View File
@@ -139,12 +139,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId> <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
spring-rest-testing/pom.xml
+1 -6
View File
@@ -177,14 +177,9 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- <dependency> -->
<!-- <groupId>org.hamcrest</groupId> -->
<!-- <artifactId>hamcrest-core</artifactId> -->
<!-- <scope>test</scope> -->
<!-- </dependency> -->
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId> <artifactId>hamcrest</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
spring-resttemplate/pom.xml
+1 -6
View File
@@ -130,12 +130,7 @@
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId> <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
spring-security-modules/spring-security-cache-control/pom.xml
+2 -6
View File
@@ -42,12 +42,8 @@
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId> <artifactId>hamcrest</artifactId>
<scope>test</scope> <version>${hamcrest.version}</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
spring-security-modules/spring-security-mvc-boot-1/pom.xml
+1 -6
View File
@@ -61,12 +61,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId> <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
spring-security-modules/spring-security-mvc-boot-2/pom.xml
+1 -6
View File
@@ -61,12 +61,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId> <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
spring-security-modules/spring-security-rest-custom/pom.xml
+1 -6
View File
@@ -136,12 +136,7 @@
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId> <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
testing-modules/hamcrest/pom.xml
+2 -2
View File
@@ -18,13 +18,13 @@
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>java-hamcrest</artifactId> <artifactId>java-hamcrest</artifactId>
<version>${hamcrest.version}</version> <version>${java-hamcrest.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<properties> <properties>
<hamcrest.version>2.0.0.0</hamcrest.version> <java-hamcrest.version>2.0.0.0</java-hamcrest.version>
</properties> </properties>
</project> </project>
testing-modules/mockito/pom.xml
-1
View File
@@ -90,7 +90,6 @@
<!-- testing --> <!-- testing -->
<powermock.version>2.0.2</powermock.version> <powermock.version>2.0.2</powermock.version>
<hamcrest.version>2.0.0.0</hamcrest.version>
<javax.persistence.version>2.1.1</javax.persistence.version> <javax.persistence.version>2.1.1</javax.persistence.version>
</properties> </properties>
testing-modules/selenium-junit-testng/pom.xml
+2 -2
View File
@@ -38,7 +38,7 @@
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId> <artifactId>hamcrest-all</artifactId>
<version>${org.hamcrest.version}</version> <version>${hamcrest-all.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
@@ -71,4 +71,4 @@
<selenium-java.version>3.4.0</selenium-java.version> <selenium-java.version>3.4.0</selenium-java.version>
</properties> </properties>
</project> </project>
testing-modules/spring-testing/pom.xml
+2 -2
View File
@@ -19,7 +19,7 @@
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>java-hamcrest</artifactId> <artifactId>java-hamcrest</artifactId>
<version>${hamcrest.version}</version> <version>${java-hamcrest.version}</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -114,7 +114,7 @@
<properties> <properties>
<!-- testing --> <!-- testing -->
<hamcrest.version>2.0.0.0</hamcrest.version> <java-hamcrest.version>2.0.0.0</java-hamcrest.version>
<awaitility.version>3.1.6</awaitility.version> <awaitility.version>3.1.6</awaitility.version>
<junit.jupiter.version>5.5.0</junit.jupiter.version> <junit.jupiter.version>5.5.0</junit.jupiter.version>
<junit.commons.version>1.5.2</junit.commons.version> <junit.commons.version>1.5.2</junit.commons.version>