fix: rollback to versions that supports java 8

Unleash · Jul 29, 2024 · 009e51d · 009e51d
1 parent 6d6fd09
commit 009e51d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,14 +6,14 @@
     <version>9.2.4-SNAPSHOT</version>
 
     <properties>
-        <version.slf4j>2.0.9</version.slf4j>
+        <version.slf4j>2.0.13</version.slf4j>
         <version.junit5>5.10.3</version.junit5>
         <version.okhttp>4.12.0</version.okhttp>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <version.unleash.specification>5.1.5</version.unleash.specification>
         <arguments />
         <version.jackson>2.17.2</version.jackson>
-        <version.logback>1.5.6</version.logback>
+        <version.logback>1.3.14</version.logback>
         <version.gson>2.11.0</version.gson>
     </properties>
 
@@ -112,13 +112,13 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>5.12.0</version>
+            <version>4.8.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock-jre8</artifactId>
-            <version>3.0.1</version>
+            <version>2.35.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -320,7 +320,7 @@
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
-                <version>2.43.0</version>
+                <version>2.30.0</version>
                 <configuration>
                     <formats>
                         <format>

diff --git a/src/main/java/io/getunleash/util/ConstraintMerger.java b/src/main/java/io/getunleash/util/ConstraintMerger.java
@@ -17,8 +17,7 @@ public static List<Constraint> mergeConstraints(
                         Optional.ofNullable(strategy.getConstraints())
                                 .orElseGet(Collections::emptyList),
                         Optional.ofNullable(strategy.getSegments())
-                                .orElseGet(Collections::emptyList)
-                                .stream()
+                                .orElseGet(Collections::emptyList).stream()
                                 .map(repository::getSegment)
                                 .map(s -> s == null ? DENY_SEGMENT : s)
                                 .map(Segment::getConstraints)

diff --git a/src/test/java/io/getunleash/util/IpAddressMatcherTest.java b/src/test/java/io/getunleash/util/IpAddressMatcherTest.java
@@ -19,9 +19,7 @@
 
 import org.junit.jupiter.api.Test;
 
-/**
- * @author Luke Taylor
- */
+/** @author Luke Taylor */
 class IpAddressMatcherTest {
     private final IpAddressMatcher v6matcher = new IpAddressMatcher("fe80::21f:5bff:fe33:bd68");
     private final IpAddressMatcher v4matcher = new IpAddressMatcher("192.168.1.104");