Merge branch 'main' into completed

bobocode-projects · Oct 17, 2023 · 8a6e28b · 8a6e28b
2 parents 940fa2d + c6617fa
commit 8a6e28b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 30 deletions.
diff --git a/...l-programming/5-3-1-crazy-optionals/src/test/java/com/bobocode/fp/CrazyOptionalsTest.java b/...l-programming/5-3-1-crazy-optionals/src/test/java/com/bobocode/fp/CrazyOptionalsTest.java
@@ -201,8 +201,6 @@ void retrieveBalanceShouldUseNullSafeMapping() {
         CrazyOptionals.retrieveBalance(() -> optionalAccountSpy);
 
         verify(optionalAccountSpy, never()).get();
-        verify(optionalAccountSpy, never()).isEmpty();
-        verify(optionalAccountSpy, times(1)).isPresent();
         verify(optionalAccountSpy, never()).orElse(any());
         verify(optionalAccountSpy, never()).orElseGet(any());
         verify(optionalAccountSpy, times(1)).map(any());
@@ -264,8 +262,6 @@ void retrieveCreditBalanceShouldUseNullSafeMapping() {
         CrazyOptionals.retrieveCreditBalance(() -> optionalCreditAccountSpy);
 
         verify(optionalCreditAccountSpy, never()).get();
-        verify(optionalCreditAccountSpy, never()).isEmpty();
-        verify(optionalCreditAccountSpy, times(1)).isPresent();
         verify(optionalCreditAccountSpy, never()).orElse(any());
         verify(optionalCreditAccountSpy, never()).orElseGet(any());
         verify(optionalCreditAccountSpy, times(1)).flatMap(any());
@@ -311,8 +307,6 @@ void retrieveAccountGmailShouldUseNullSafeFiltering() {
         CrazyOptionals.retrieveAccountGmail(() -> optionalAccountSpy);
 
         verify(optionalAccountSpy, never()).get();
-        verify(optionalAccountSpy, times(1)).isPresent();
-        verify(optionalAccountSpy, never()).isEmpty();
         verify(optionalAccountSpy, never()).orElse(any());
         verify(optionalAccountSpy, times(1)).filter(any());
     }

diff --git a/java-fundamentals-util/pom.xml b/java-fundamentals-util/pom.xml
@@ -10,11 +10,6 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>java-fundamentals-util</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-    </properties>
 
     <dependencies>
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -10,8 +10,8 @@
     <packaging>pom</packaging>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -31,31 +31,25 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.8.2</version>
+            <version>5.10.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
-            <version>5.8.2</version>
+            <version>5.10.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.22.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <version>2.2</version>
+            <version>3.24.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.24</version>
+            <version>1.18.30</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
@@ -65,19 +59,39 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>4.5.1</version>
+            <version>5.6.0</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>net.bytebuddy</groupId>
+                    <artifactId>byte-buddy</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.bytebuddy</groupId>
+                    <artifactId>byte-buddy-agent</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy</artifactId>
+            <version>1.14.9</version>
+        </dependency>
+        <dependency>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy-agent</artifactId>
+            <version>1.14.9</version>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-inline</artifactId>
-            <version>4.5.1</version>
+            <version>5.2.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.36</version>
+            <version>2.0.9</version>
         </dependency>
     </dependencies>
 
@@ -87,7 +101,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.10.1</version>
+                    <version>3.11.0</version>
                     <configuration>
                         <compilerArgs>
                             <arg>-parameters</arg>
@@ -97,11 +111,9 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.0.0-M6</version>
+                    <version>3.1.2</version>
                 </plugin>
             </plugins>
         </pluginManagement>
     </build>
-
-
 </project>