From a6734896213d86d8ff306554ee6a2443bc614817 Mon Sep 17 00:00:00 2001
From: Tomas Hofman <thofman@redhat.com>
Date: Wed, 15 Nov 2023 15:53:04 +0100
Subject: [PATCH] Upgrade itf-extension to 0.12.0

---
 .../it/UpgradeComponentsMojoIT.java           | 19 +++++++++----------
 pom.xml                                       |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/integration-tests/src/test/java/org/wildfly/channelplugin/it/UpgradeComponentsMojoIT.java b/integration-tests/src/test/java/org/wildfly/channelplugin/it/UpgradeComponentsMojoIT.java
index e2c6d87..43a42cc 100644
--- a/integration-tests/src/test/java/org/wildfly/channelplugin/it/UpgradeComponentsMojoIT.java
+++ b/integration-tests/src/test/java/org/wildfly/channelplugin/it/UpgradeComponentsMojoIT.java
@@ -1,7 +1,7 @@
 package org.wildfly.channelplugin.it;
 
-import java.io.File;
 import java.net.MalformedURLException;
+import java.nio.file.Path;
 import java.util.Optional;
 import java.util.logging.Logger;
 
@@ -23,7 +23,6 @@
 import static com.soebes.itf.extension.assertj.MavenExecutionResultAssert.assertThat;
 import static org.assertj.core.api.Assertions.assertThat;
 
-@SuppressWarnings("OptionalGetWithoutIsPresent")
 @MavenJupiterExtension
 @MavenPredefinedRepository("maven-repo")
 public class UpgradeComponentsMojoIT {
@@ -52,26 +51,26 @@ void basic_project_test_case(MavenExecutionResult result) {
         // verify dependency versions are still set to properties
         assertThat(dependencyModel.getDependency("io.undertow", "undertow-core", "jar", null))
                 .satisfies(o -> {
-                    assertThat(o.isPresent());
+                    assertThat(o).isPresent();
                     assertThat(o.get().getVersion()).isEqualTo("${undertow.version}");
                 });
         assertThat(dependencyModel.getDependency("io.undertow", "undertow-servlet", "jar", null))
                 .satisfies(o -> {
-                    assertThat(o.isPresent());
+                    assertThat(o).isPresent();
                     assertThat(o.get().getVersion()).isEqualTo("${undertow.version}");
                 });
 
         // verify dependency version has been overriden
         assertThat(dependencyModel.getDependency("org.jboss.marshalling", "jboss-marshalling", "jar", null))
                 .satisfies(o -> {
-                    assertThat(o.isPresent());
+                    assertThat(o).isPresent();
                     assertThat(o.get().getVersion()).isEqualTo("2.0.9.Final-redhat-00001");
                 });
 
         // verify version specified by recursive property reference
         assertThat(dependencyModel.getDependency("commons-io", "commons-io", "jar", null))
                 .satisfies(o -> {
-                    assertThat(o.isPresent());
+                    assertThat(o).isPresent();
                     assertThat(o.get().getVersion()).isEqualTo("${commons.version}");
                 });
         assertThat(model.getProperties().get("commons.version")).isEqualTo("${commons2.version}");
@@ -95,8 +94,8 @@ void basic_project_test_case(MavenExecutionResult result) {
     void eap_bom_test_case(MavenExecutionResult result) throws MalformedURLException {
         assertThat(result).isSuccessful();
 
-        File manifestFile = new File(result.getMavenProjectResult().getTargetProjectDirectory(), "manifest.yaml");
-        ChannelManifest channel = ChannelManifestMapper.from(manifestFile.toURI().toURL());
+        Path manifestFile = result.getMavenProjectResult().getTargetProjectDirectory().resolve("manifest.yaml");
+        ChannelManifest channel = ChannelManifestMapper.from(manifestFile.toUri().toURL());
         Model model = result.getMavenProjectResult().getModel();
 
         for (Dependency dependency : model.getDependencyManagement().getDependencies()) {
@@ -143,7 +142,7 @@ void override_property_test_case(MavenExecutionResult result) {
         // dependency still referencing the property
         assertThat(dependencyModel.getDependency("io.undertow", "undertow-core", "jar", null))
                 .satisfies(o -> {
-                    assertThat(o.isPresent());
+                    assertThat(o).isPresent();
                     assertThat(o.get().getVersion()).isEqualTo("${undertow.version}");
                 });
     }
@@ -167,7 +166,7 @@ void override_dependency_test_case(MavenExecutionResult result) {
         // verify dependency version element has been overridden
         assertThat(dependencyModel.getDependency("io.undertow", "undertow-core", "jar", null))
                 .satisfies(o -> {
-                    assertThat(o.isPresent());
+                    assertThat(o).isPresent();
                     assertThat(o.get().getVersion()).isEqualTo("2.2.5.Final-Overridden");
                 });
     }
diff --git a/pom.xml b/pom.xml
index fc28b3b..533b389 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
         <channel.version>1.0.5.Final</channel.version>
         <jupiter.version>5.7.2</jupiter.version>
         <assertj.version>3.22.0</assertj.version>
-        <itf.version>0.11.0</itf.version>
+        <itf.version>0.12.0</itf.version>
     </properties>
 
     <dependencyManagement>