Merge branch '__rultor'

eo-maven-plugin/pom.xml

@@ -81,7 +81,9 @@ SOFTWARE.
       <groupId>net.sf.saxon</groupId>
       <artifactId>Saxon-HE</artifactId>
       <!-- version from parent POM -->
-      <scope>runtime</scope>
+      <!-- We need Saxon library in compile time
+      in order to use XPath 2.0 specific features -->
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.jcabi</groupId>

eo-maven-plugin/src/main/java/org/eolang/maven/DiscoverMojo.java

@@ -24,6 +24,7 @@
 package org.eolang.maven;
 
 import com.jcabi.log.Logger;
+import com.jcabi.xml.SaxonDocument;
 import com.jcabi.xml.XML;
 import com.jcabi.xml.XMLDocument;
 import java.io.FileNotFoundException;
@@ -37,6 +38,8 @@
 import org.cactoos.iterable.Filtered;
 import org.cactoos.list.ListOf;
 import org.cactoos.set.SetOf;
+import org.cactoos.text.TextOf;
+import org.cactoos.text.UncheckedText;
 import org.eolang.maven.tojos.ForeignTojo;
 import org.eolang.maven.util.Rel;
 
@@ -93,17 +96,23 @@ public void exec() throws FileNotFoundException {
      * @param file The .xmir file
      * @return List of foreign objects found
      * @throws FileNotFoundException If not found
+     * @todo #2266:30min Use more convenient constructor for SaxonDocument.
+     *  The current constructor for SaxonDocument is not convenient and requires a lot of
+     *  code. It would be better to create SaxonDocument right from the file.
+     *  When the related issue will be implemented in jcabi-xml (you can check the progress
+     *  <a href="https://github.com/jcabi/jcabi-xml/issues/215">here</a>)
+     *  We have to change the constructor for SaxonDocument in this class and remove that puzzle.
      */
     private Collection<String> discover(final Path file)
         throws FileNotFoundException {
-        final XML xml = new XMLDocument(file);
-        final Collection<String> names = DiscoverMojo.names(xml, this.xpath(false));
+        final XML saxon = new SaxonDocument(new UncheckedText(new TextOf(file)).asString());
+        final Collection<String> names = DiscoverMojo.names(saxon, this.xpath(false));
         if (this.withVersions) {
             names.addAll(
-                DiscoverMojo.names(xml, this.xpath(true))
+                DiscoverMojo.names(saxon, this.xpath(true))
             );
         }
-        if (!xml.nodes("//o[@vararg]").isEmpty()) {
+        if (!new XMLDocument(file).nodes("//o[@vararg]").isEmpty()) {
             names.add("org.eolang.tuple");
         }
         if (names.isEmpty()) {

eo-maven-plugin/src/test/java/org/eolang/maven/DiscoverMojoTest.java

@@ -32,12 +32,12 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 import org.cactoos.io.ResourceOf;
+import org.eolang.maven.hash.CommitHash;
 import org.eolang.maven.hash.CommitHashesMap;
 import org.eolang.maven.tojos.ForeignTojo;
 import org.eolang.maven.tojos.ForeignTojos;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -47,12 +47,6 @@
  * Test case for {@link DiscoverMojo}.
  *
  * @since 0.28.11
- * @todo #2259:30min Enable discoversWithSeveralObjectsWithDifferentVersions test.
- *  The discoversWithSeveralObjectsWithDifferentVersions test is disabled because we have found
- *  a bug in jcabi-xml library. You can read more about the bug
- *  <a href="https://github.com/jcabi/jcabi-xml/issues/211">here</a>
- *  When the bug will be fixed, we have to enable discoversWithSeveralObjectsWithDifferentVersions
- *  test.
  */
 final class DiscoverMojoTest {
 
@@ -149,12 +143,13 @@ void discoversWithVersions(@TempDir final Path tmp) throws IOException {
     }
 
     @Test
-    @Disabled
     void discoversWithSeveralObjectsWithDifferentVersions(
         @TempDir final Path tmp
     ) throws IOException {
+        final Map<String, CommitHash> hashes = new CommitHashesMap.Fake();
         final FakeMaven maven = new FakeMaven(tmp)
             .with("withVersions", true)
+            .with("hashes", hashes)
             .withProgram(
                 "+alias org.eolang.txt.sprintf\n",
                 "[] > main",
@@ -170,8 +165,14 @@ void discoversWithSeveralObjectsWithDifferentVersions(
                 "    nop"
             )
             .execute(new FakeMaven.Discover());
-        final String first = "org.eolang.txt.sprintf|0.28.1";
-        final String second = "org.eolang.txt.sprintf|0.28.2";
+        final String first = String.format(
+            "org.eolang.txt.sprintf|%s",
+            hashes.get("0.28.1").value()
+        );
+        final String second = String.format(
+            "org.eolang.txt.sprintf|%s",
+            hashes.get("0.28.2").value()
+        );
         final ForeignTojos tojos = maven.externalTojos();
         MatcherAssert.assertThat(
             String.format(DiscoverMojoTest.SHOULD_CONTAIN, first),