Raise required Java version to 17

assertj-core/pom.xml

@@ -317,26 +317,15 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>jdk9</id>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-            <configuration>
-              <release>9</release>
-              <compileSourceRoots>
-                <compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
-              </compileSourceRoots>
-              <multiReleaseOutput>true</multiReleaseOutput>
-            </configuration>
-          </execution>
-        </executions>
+        <configuration>
+          <useModulePath>false</useModulePath> <!-- FIXME #3446 -->
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
+          <useModulePath>false</useModulePath> <!-- FIXME #3446 -->
           <trimStackTrace>false</trimStackTrace>
           <excludes>
             <exclude>org/assertj/core/internal/objects/Objects_assertHasOnlyFields_Test*</exclude>
@@ -419,6 +408,9 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <legacyMode>true</legacyMode> <!-- FIXME #3446 -->
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

assertj-guava/pom.xml

@@ -42,12 +42,6 @@
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
-    <!-- Test -->
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

assertj-guava/src/main/java/module-info.java

@@ -0,0 +1,25 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * Copyright 2012-2024 the original author or authors.
+ */
+
+/**
+ * AssertJ extension for Guava assertions.
+ */
+module org.assertj.guava {
+  requires transitive org.assertj.core;
+  requires com.google.common;
+
+  exports org.assertj.guava.api;
+  exports org.assertj.guava.data;
+  exports org.assertj.guava.error;
+  exports org.assertj.guava.util;
+}

assertj-parent/pom.xml

@@ -16,7 +16,7 @@
 
   <properties>
     <additionalparam>-Xdoclint:none</additionalparam>
-    <java.version>8</java.version>
+    <java.version>17</java.version>
     <maven.compiler.parameters>true</maven.compiler.parameters>
     <maven.compiler.release>${java.version}</maven.compiler.release>
     <maven.compiler.source>${java.version}</maven.compiler.source>

assertj-tests/assertj-integration-tests/assertj-guava-module-path/pom.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.assertj</groupId>
+    <artifactId>assertj-integration-tests</artifactId>
+    <version>3.26.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>assertj-guava-module-path</artifactId>
+
+  <name>AssertJ Guava Integration Tests - Module Path</name>
+
+  <properties>
+    <rootDirectory>${project.basedir}/../../../</rootDirectory>
+    <spotless.skip>false</spotless.skip>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>33.2.0-jre</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-guava</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>

assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/module-info.java

@@ -0,0 +1,17 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * Copyright 2012-2024 the original author or authors.
+ */
+open module org.assertj.guava.tests {
+  requires com.google.common;
+  requires org.assertj.guava;
+  requires org.junit.jupiter.params;
+}

assertj-guava/src/test/java/org/assertj/guava/api/Assertions_assertThat_with_Multimap_Test.java → assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/Assertions_assertThat_with_Multimap_Test.java

@@ -10,11 +10,12 @@
  *
  * Copyright 2012-2024 the original author or authors.
  */
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
 
 import static org.assertj.core.api.BDDAssertions.then;
 import static org.assertj.guava.api.Assertions.assertThat;
 
+import org.assertj.guava.api.MultimapAssert;
 import org.junit.jupiter.api.Test;
 
 import com.google.common.collect.HashMultimap;
@@ -35,14 +36,4 @@ void should_create_Assert() {
     then(assertion).isNotNull();
   }
 
-  @Test
-  void should_pass_actual() {
-    // GIVEN
-    Multimap<String, String> actual = HashMultimap.create();
-    // WHEN
-    Multimap<String, String> result = assertThat(actual).getActual();
-    // THEN
-    then(result).isSameAs(actual);
-  }
-
 }

assertj-guava/src/test/java/org/assertj/guava/api/Assertions_assertThat_with_Optional_Test.java → assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/Assertions_assertThat_with_Optional_Test.java

@@ -10,19 +10,19 @@
  *
  * Copyright 2012-2024 the original author or authors.
  */
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
 
 import static org.assertj.core.api.BDDAssertions.then;
 import static org.assertj.guava.api.Assertions.assertThat;
 
+import org.assertj.guava.api.OptionalAssert;
 import org.junit.jupiter.api.Test;
 
 import com.google.common.base.Optional;
 
 /**
  * @author Joel Costigliola
  */
-@SuppressWarnings("Guava")
 class Assertions_assertThat_with_Optional_Test {
 
   @Test
@@ -35,14 +35,4 @@ void should_create_Assert() {
     then(assertion).isNotNull();
   }
 
-  @Test
-  void should_pass_actual() {
-    // GIVEN
-    Optional<String> actual = Optional.of("value");
-    // WHEN
-    Optional<String> result = assertThat(actual).getActual();
-    // THEN
-    then(result).isSameAs(actual);
-  }
-
 }

assertj-guava/src/test/java/org/assertj/guava/api/Assertions_sync_with_InstanceOfAssertFactories_Test.java → assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/Assertions_sync_with_InstanceOfAssertFactories_Test.java

@@ -10,7 +10,7 @@
  *
  * Copyright 2012-2024 the original author or authors.
  */
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
 
 import static java.util.stream.Collectors.toMap;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -34,6 +34,11 @@
 import java.util.stream.Stream;
 
 import org.assertj.core.api.InstanceOfAssertFactory;
+import org.assertj.guava.api.Assertions;
+import org.assertj.guava.api.InstanceOfAssertFactories;
+import org.assertj.guava.api.RangeAssert;
+import org.assertj.guava.api.RangeMapAssert;
+import org.assertj.guava.api.RangeSetAssert;
 import org.junit.jupiter.api.Test;
 
 /**

assertj-guava/src/test/java/org/assertj/guava/api/ByteSourceAssert_hasSameContentAs_Test.java → assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/ByteSourceAssert_hasSameContentAs_Test.java

@@ -10,13 +10,13 @@
  *
  * Copyright 2012-2024 the original author or authors.
  */
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
 
 import static org.assertj.core.api.BDDAssertions.then;
 import static org.assertj.core.util.FailureMessages.actualIsNull;
 import static org.assertj.guava.api.Assertions.assertThat;
 import static org.assertj.guava.error.ShouldHaveSameContent.shouldHaveSameContent;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import static org.assertj.guava.tests.testkit.AssertionErrors.expectAssertionError;
 
 import java.io.IOException;
 

assertj-guava/src/test/java/org/assertj/guava/api/ByteSourceAssert_hasSize_Test.java → assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/ByteSourceAssert_hasSize_Test.java

@@ -10,7 +10,7 @@
  *
  * Copyright 2012-2024 the original author or authors.
  */
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
 
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;

assertj-guava/src/test/java/org/assertj/guava/api/ByteSourceAssert_isEmpty_Test.java → assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/ByteSourceAssert_isEmpty_Test.java

@@ -10,7 +10,7 @@
  *
  * Copyright 2012-2024 the original author or authors.
  */
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
 
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;

assertj-guava/src/test/java/org/assertj/guava/api/InstanceOfAssertFactoriesTest.java → assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/InstanceOfAssertFactoriesTest.java

@@ -10,7 +10,7 @@
  *
  * Copyright 2012-2024 the original author or authors.
  */
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.data.MapEntry.entry;
@@ -29,6 +29,15 @@
 
 import java.io.IOException;
 
+import org.assertj.guava.api.Assertions;
+import org.assertj.guava.api.ByteSourceAssert;
+import org.assertj.guava.api.MultimapAssert;
+import org.assertj.guava.api.MultisetAssert;
+import org.assertj.guava.api.OptionalAssert;
+import org.assertj.guava.api.RangeAssert;
+import org.assertj.guava.api.RangeMapAssert;
+import org.assertj.guava.api.RangeSetAssert;
+import org.assertj.guava.api.TableAssert;
 import org.junit.jupiter.api.Test;
 
 import com.google.common.base.Optional;

assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssertBaseTest.java → assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssertBaseTest.java

@@ -10,7 +10,7 @@
  *
  * Copyright 2012-2024 the original author or authors.
  */
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
 
 import static com.google.common.collect.Lists.newArrayList;
 
@@ -35,4 +35,4 @@ public void setUp() {
     actual.putAll("Spurs", newArrayList("Tony Parker", "Tim Duncan", "Manu Ginobili"));
   }
 
-}
+}

assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_containsAllEntriesOf_Test.java → assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_containsAllEntriesOf_Test.java

@@ -10,7 +10,7 @@
  *
  * Copyright 2012-2024 the original author or authors.
  */
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
 
 import static com.google.common.collect.Lists.newArrayList;
 import static org.assertj.core.api.Assertions.catchThrowable;
@@ -20,8 +20,8 @@
 import static org.assertj.core.util.FailureMessages.actualIsNull;
 import static org.assertj.core.util.Lists.list;
 import static org.assertj.guava.api.Assertions.assertThat;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
 
+import org.assertj.guava.tests.testkit.AssertionErrors;
 import org.junit.jupiter.api.Test;
 
 import com.google.common.collect.HashMultimap;
@@ -76,7 +76,7 @@ void should_fail_if_actual_is_null() {
     // GIVEN
     actual = null;
     // WHEN
-    AssertionError error = expectAssertionError(() -> assertThat(actual).containsAllEntriesOf(other));
+    AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).containsAllEntriesOf(other));
     // THEN
     then(error).hasMessage(actualIsNull());
   }
@@ -100,7 +100,7 @@ void should_fail_if_actual_does_not_contain_all_given_multimap_entries() {
     other.putAll("Spurs", newArrayList("Tony Parker", "Tim Duncan", "Manu Ginobili"));
     other.putAll("Warriors", newArrayList("Stephen Curry", "Klay Thompson"));
     // WHEN
-    AssertionError error = expectAssertionError(() -> assertThat(actual).containsAllEntriesOf(other));
+    AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).containsAllEntriesOf(other));
     // THEN
     then(error).hasMessage(shouldContain(actual, other,
                                          list(entry("Warriors", "Stephen Curry"), entry("Warriors", "Klay Thompson"))).create());

assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_containsKeys_Test.java → assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_containsKeys_Test.java

@@ -10,7 +10,7 @@
  *
  * Copyright 2012-2024 the original author or authors.
  */
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
 
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;

assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_containsValues_Test.java → assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_containsValues_Test.java

@@ -10,7 +10,7 @@
  *
  * Copyright 2012-2024 the original author or authors.
  */
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
 
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;