From 7b0aa987faf77e2c7660272804df7cffc3c26eab Mon Sep 17 00:00:00 2001 From: Joe Schmetzer Date: Sun, 30 Jun 2024 14:38:37 +1000 Subject: [PATCH] Java 1.8 (#411) * #331 Bumped source and target compatibility to Java 1.8 * hamcrest v3.0-SNAPSHOT * JUnit v5.8.2 * No longer using Travis Co-authored-by: John Patrick <142304+nhojpatrick@users.noreply.github.com> Co-authored-by: Peter De Maeyer --- .travis.yml | 25 ------------------- BUILDING.txt | 2 +- CHANGES.md | 12 +++++++++ build.gradle | 6 ++--- hamcrest/hamcrest.gradle | 8 ++++-- .../hamcrest/collection/ArrayMatching.java | 2 +- .../IsArrayContainingInAnyOrder.java | 2 +- .../collection/IsArrayContainingInOrder.java | 2 +- .../IsIterableContainingInAnyOrder.java | 2 +- .../IsIterableContainingInRelativeOrder.java | 2 +- .../main/java/org/hamcrest/core/AllOf.java | 2 +- .../main/java/org/hamcrest/core/AnyOf.java | 2 +- .../org/hamcrest/core/CombinableMatcher.java | 4 +-- 13 files changed, 31 insertions(+), 40 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d2c0b4a45..000000000 --- a/.travis.yml +++ /dev/null @@ -1,25 +0,0 @@ -language: java - -os: linux - -# Need to select an older Ubuntu distribution that supports JDK7 -dist: trusty - -jdk: - - openjdk7 - - oraclejdk8 - - openjdk8 - - openjdk11 - - openjdk17 - -# Workaround to using openjdk7 with Gradle due to security issue: -# https://github.com/gradle/gradle/issues/2421 -before_install: -- BCPROV_FILENAME=bcprov-ext-jdk15on-158.jar -- wget "https://bouncycastle.org/download/${BCPROV_FILENAME}" -- sudo mv $BCPROV_FILENAME /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/ext -- sudo perl -pi.bak -e 's/^(security\.provider\.)([0-9]+)/$1.($2+1)/ge' /etc/java-7-openjdk/security/java.security -- echo "security.provider.1=org.bouncycastle.jce.provider.BouncyCastleProvider" | sudo tee -a /etc/java-7-openjdk/security/java.security - -script: - - ./gradlew clean build javadoc diff --git a/BUILDING.txt b/BUILDING.txt index b5af7f6f9..ec52cb326 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -4,7 +4,7 @@ --[ Build requirements ]------------------------------------- -* JDK 1.7 +* JDK 1.8 --[ Building from the command line ]------------------------- diff --git a/CHANGES.md b/CHANGES.md index e926232fc..8affbcc4e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,17 @@ # Hamcrest Changes +## Version 3.0 (Unreleased) + +### Improvements + +* Java 1.8 or newer ([Issue #331](https://github.com/hamcrest/JavaHamcrest/issues/331)). + +TBD + +### Bugfixes + +TBD + ## Version 2.3 (Unreleased) ### Improvements diff --git a/build.gradle b/build.gradle index ae063fc61..b1d076997 100644 --- a/build.gradle +++ b/build.gradle @@ -3,14 +3,14 @@ apply plugin: 'osgi' apply plugin: 'maven-publish' group = "org.hamcrest" -version = "2.3-SNAPSHOT" +version = "3.0-SNAPSHOT" subprojects { apply plugin: 'checkstyle' apply plugin: 'java-library' - sourceCompatibility = JavaVersion.VERSION_1_7 - targetCompatibility = JavaVersion.VERSION_1_7 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 group = rootProject.group version = rootProject.version diff --git a/hamcrest/hamcrest.gradle b/hamcrest/hamcrest.gradle index 52d86526b..5450eaef2 100644 --- a/hamcrest/hamcrest.gradle +++ b/hamcrest/hamcrest.gradle @@ -3,8 +3,12 @@ apply plugin: 'osgi' version = rootProject.version dependencies { - testImplementation(group: 'junit', name: 'junit', version: '4.13.2') { - transitive = false + testImplementation(group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.2') { + transitive = true + } + testImplementation(group: 'org.junit.vintage', name: 'junit-vintage-engine', version: '5.8.2') { + transitive = true + exclude(module: 'hamcrest-core') } } diff --git a/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java b/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java index ed41c6bfc..86805ae1f 100644 --- a/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java +++ b/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java @@ -75,7 +75,7 @@ public static Matcher hasItemInArray(T element) { */ @SafeVarargs public static Matcher arrayContainingInAnyOrder(Matcher... itemMatchers) { - return arrayContainingInAnyOrder(asList(itemMatchers)); + return arrayContainingInAnyOrder((Collection) asList(itemMatchers)); } /** diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java index 06d05feac..93490de36 100644 --- a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java +++ b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java @@ -62,7 +62,7 @@ public void describeTo(Description description) { * @return The matcher. */ public static Matcher arrayContainingInAnyOrder(Matcher... itemMatchers) { - return arrayContainingInAnyOrder(Arrays.asList(itemMatchers)); + return arrayContainingInAnyOrder((Collection) Arrays.asList(itemMatchers)); } /** diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java index 4bf58bd3e..291ed1db5 100644 --- a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java +++ b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java @@ -78,7 +78,7 @@ public static Matcher arrayContaining(E... items) { * @return The matcher. */ public static Matcher arrayContaining(Matcher... itemMatchers) { - return arrayContaining(asList(itemMatchers)); + return arrayContaining((List) asList(itemMatchers)); } /** diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java index 262a12630..087570cd4 100644 --- a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java +++ b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java @@ -102,7 +102,7 @@ private boolean isMatched(S item) { */ @SafeVarargs public static Matcher> containsInAnyOrder(Matcher... itemMatchers) { - return containsInAnyOrder(Arrays.asList(itemMatchers)); + return containsInAnyOrder((Collection) Arrays.asList(itemMatchers)); } /** diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java index 34233cf97..6aca721ec 100644 --- a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java +++ b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java @@ -105,7 +105,7 @@ public static Matcher> containsInRelativeOrder(E... it */ @SafeVarargs public static Matcher> containsInRelativeOrder(Matcher... itemMatchers) { - return containsInRelativeOrder(asList(itemMatchers)); + return containsInRelativeOrder((List) asList(itemMatchers)); } /** diff --git a/hamcrest/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest/src/main/java/org/hamcrest/core/AllOf.java index d4efdb995..549f16817 100644 --- a/hamcrest/src/main/java/org/hamcrest/core/AllOf.java +++ b/hamcrest/src/main/java/org/hamcrest/core/AllOf.java @@ -68,7 +68,7 @@ public static Matcher allOf(Iterable> matchers) { */ @SafeVarargs public static Matcher allOf(Matcher... matchers) { - return allOf(Arrays.asList(matchers)); + return allOf((Iterable) Arrays.asList(matchers)); } } diff --git a/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java index bcc1bb4f5..91c664d95 100644 --- a/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java +++ b/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java @@ -58,7 +58,7 @@ public static AnyOf anyOf(Iterable> matchers) { */ @SafeVarargs public static AnyOf anyOf(Matcher... matchers) { - return anyOf(Arrays.asList(matchers)); + return anyOf((Iterable) Arrays.asList(matchers)); } } diff --git a/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java b/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java index dc882d792..52a134aff 100644 --- a/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java +++ b/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java @@ -69,7 +69,7 @@ public CombinableBothMatcher(Matcher matcher) { this.first = matcher; } public CombinableMatcher and(Matcher other) { - return new CombinableMatcher<>(first).and(other); + return new CombinableMatcher(first).and(other); } } @@ -94,7 +94,7 @@ public CombinableEitherMatcher(Matcher matcher) { this.first = matcher; } public CombinableMatcher or(Matcher other) { - return new CombinableMatcher<>(first).or(other); + return new CombinableMatcher(first).or(other); } }