Merge branch 'master' into 2863-reduce-code-duplication-15

objectionary · Mar 11, 2024 · 3842823 · 3842823
2 parents adee12e + 74d04a4
commit 3842823
Show file tree

Hide file tree

Showing 95 changed files with 1,068 additions and 967 deletions.
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
-      - uses: teatimeguest/setup-texlive-action@v3.0.2
+      - uses: teatimeguest/setup-texlive-action@v3.1.0
         with:
           update-all-packages: true
           packages: scheme-basic geometry xcolor naive-ebnf microtype etoolbox

diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
-      - uses: teatimeguest/setup-texlive-action@v3.0.2
+      - uses: teatimeguest/setup-texlive-action@v3.1.0
         with:
           update-all-packages: true
           packages: scheme-basic geometry xcolor naive-ebnf microtype etoolbox

diff --git a/.github/workflows/ebnf.yml b/.github/workflows/ebnf.yml
@@ -17,7 +17,7 @@ jobs:
       - run: |
           sudo apt-get update
           sudo apt-get -y install ghostscript imagemagick texlive-extra-utils pdf2svg inkscape
-      - uses: teatimeguest/setup-texlive-action@v3.0.2
+      - uses: teatimeguest/setup-texlive-action@v3.1.0
         with:
           update-all-packages: true
           packages: scheme-basic geometry xcolor naive-ebnf microtype etoolbox

diff --git a/.github/workflows/latexmk.yml b/.github/workflows/latexmk.yml
@@ -11,10 +11,10 @@ concurrency:
   cancel-in-progress: true
 jobs:
   latexmk:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
-      - uses: yegor256/[email protected].8
+      - uses: yegor256/[email protected].9
         with:
           path: paper
           opts: -pdf

diff --git a/.github/workflows/markdown-lint.yml b/.github/workflows/markdown-lint.yml
@@ -15,5 +15,5 @@ jobs:
   markdown-lint:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@b32f140b0c872d58512e0a66172253c302617b90
+      - uses: actions/checkout@8eb1f6a495037164bea451156472f35fdd6bafc0
       - uses: articulate/actions-markdownlint@v1
diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
@@ -4,17 +4,18 @@ on:
   push:
     branches:
       - master
+    paths-ignore: [ 'paper/**', 'sandbox/**' ]
   pull_request:
     branches:
       - master
+    paths-ignore: [ 'paper/**', 'sandbox/**' ]
 concurrency:
   group: shellcheck-${{ github.ref }}
   cancel-in-progress: true
 jobs:
   shellcheck:
     name: Shellcheck
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-      - name: Run ShellCheck
-        uses: ludeeus/action-shellcheck@master
+      - uses: ludeeus/action-shellcheck@master
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
           fetch-depth: 0
-      - uses: teatimeguest/setup-texlive-action@v3.0.2
+      - uses: teatimeguest/setup-texlive-action@v3.1.0
         with:
           update-all-packages: true
           packages: scheme-basic geometry xcolor naive-ebnf microtype etoolbox
@@ -35,4 +35,4 @@ jobs:
       - env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn --batch-mode install -Dinvoker.skip org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pjacoco -Dsonar.qualitygate.wait=true
+        run: mvn --batch-mode install -Dinvoker.skip org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pjacoco -Dsonar.java.source=1.8 -Dsonar.qualitygate.wait=true
diff --git a/.rultor.yml b/.rultor.yml
@@ -1,5 +1,7 @@
 architect:
   - yegor256
+ec2:
+  type: t2.large
 docker:
   image: yegor256/rultor-image:1.22.0
 assets:

diff --git a/eo-maven-plugin/README.md b/eo-maven-plugin/README.md
@@ -35,7 +35,7 @@ create a file `pom.xml` with this content (it's just a sample):
       <plugin>
         <groupId>org.eolang</groupId>
         <artifactId>eo-maven-plugin</artifactId>
-        <version>0.35.3</version>
+        <version>0.35.5</version>
         <executions>
           <execution>
             <goals>
@@ -156,7 +156,7 @@ execution within `eo-maven-plugin/pom.xml`:
   ...
   <plugin>
     <artifactId>maven-invoker-plugin</artifactId>
-    <version>0.35.3</version>
+    <version>0.35.5</version>
     <configuration>
         <skipInstallation>true</skipInstallation>
         <skipInvocation>true</skipInvocation>

diff --git a/eo-maven-plugin/pom.xml b/eo-maven-plugin/pom.xml
@@ -207,7 +207,7 @@ SOFTWARE.
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-reload4j</artifactId>
-      <version>2.0.11</version>
+      <version>2.0.12</version>
       <scope>provided</scope>
       <!-- This dependency must precede jcabi-maven-slf4j in order
       to enable configurable Log4j logging during testing -->
@@ -286,7 +286,6 @@ SOFTWARE.
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <excludedGroups>slow</excludedGroups>
           <argLine>@{argLine} -Xss${stack-size}</argLine>
           <systemPropertyVariables>
             <runtime.path>${project.basedir}/../eo-runtime</runtime.path>
@@ -405,7 +404,7 @@ SOFTWARE.
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-xml</artifactId>
-            <version>3.0.20</version>
+            <version>3.0.21</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -490,13 +489,6 @@ SOFTWARE.
               </excludes>
             </configuration>
           </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <excludedGroups>nothing-to-exclude</excludedGroups>
-            </configuration>
-          </plugin>
           <plugin>
             <groupId>com.github.volodya-lombrozo</groupId>
             <artifactId>jtcop-maven-plugin</artifactId>

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/AssembleMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/AssembleMojo.java
@@ -113,17 +113,17 @@ public final class AssembleMojo extends SafeMojo {
 
     /**
      * Pull again even if the .eo file is already present?
-     * @checkstyle MemberNameCheck (7 lines)
      * @since 0.10.0
+     * @checkstyle MemberNameCheck (7 lines)
      */
     @Parameter(property = "eo.overWrite", required = true, defaultValue = "false")
     private boolean overWrite;
 
     /**
      * Track optimization steps into intermediate XML files?
      *
-     * @checkstyle MemberNameCheck (7 lines)
      * @since 0.24.0
+     * @checkstyle MemberNameCheck (7 lines)
      */
     @SuppressWarnings("PMD.LongVariable")
     @Parameter(property = "eo.trackOptimizationSteps", required = true, defaultValue = "false")
@@ -139,25 +139,25 @@ public final class AssembleMojo extends SafeMojo {
 
     /**
      * Skip artifact with the version 0.0.0.
-     * @checkstyle MemberNameCheck (7 lines)
      * @since 0.9.0
+     * @checkstyle MemberNameCheck (7 lines)
      */
     @Parameter(property = "eo.skipZeroVersions", required = true, defaultValue = "true")
     private boolean skipZeroVersions;
 
     /**
      * Shall we discover JAR artifacts for .EO sources?
-     * @checkstyle MemberNameCheck (7 lines)
      * @since 0.12.0
+     * @checkstyle MemberNameCheck (7 lines)
      */
     @Parameter(property = "eo.discoverSelf", required = true, defaultValue = "false")
     private boolean discoverSelf;
 
     /**
      * Fail resolution process on conflicting dependencies.
      *
-     * @checkstyle MemberNameCheck (7 lines)
      * @since 1.0
+     * @checkstyle MemberNameCheck (7 lines)
      */
     @Parameter(property = "eo.ignoreVersionConflicts", required = true, defaultValue = "false")
     @SuppressWarnings("PMD.LongVariable")
@@ -196,9 +196,9 @@ public final class AssembleMojo extends SafeMojo {
     /**
      * If set to TRUE, the exception on exit will be printed in details
      * to the log.
+     * @since 0.29.0
      * @checkstyle MemberNameCheck (7 lines)
      * @checkstyle VisibilityModifierCheck (10 lines)
-     * @since 0.29.0
      */
     @Parameter(property = "eo.unrollExitError")
     @SuppressWarnings("PMD.ImmutableField")

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/BinarizeMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/BinarizeMojo.java
@@ -39,8 +39,8 @@
 /**
  * Compile binaries.
  *
- * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
  * @since 0.1
+ * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
  */
 @Mojo(
     name = "binarize",

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/BinarizeParse.java b/eo-maven-plugin/src/main/java/org/eolang/maven/BinarizeParse.java
@@ -50,8 +50,8 @@
 /**
  * Parse rust inserts.
  *
- * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
  * @since 0.1
+ * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
  */
 @SuppressWarnings("PMD.LongVariable")
 public final class BinarizeParse {

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/DemandMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/DemandMojo.java
@@ -44,8 +44,8 @@ public final class DemandMojo extends SafeMojo {
 
     /**
      * List of object names to add.
-     * @checkstyle MemberNameCheck (7 lines)
      * @since 0.17.0
+     * @checkstyle MemberNameCheck (7 lines)
      */
     @Parameter(required = true)
     private List<String> objects;

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/OptimizeMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/OptimizeMojo.java
@@ -78,8 +78,8 @@ public final class OptimizeMojo extends SafeMojo {
     /**
      * Track optimization steps into intermediate XML files?
      *
-     * @checkstyle MemberNameCheck (7 lines)
      * @since 0.24.0
+     * @checkstyle MemberNameCheck (7 lines)
      */
     @SuppressWarnings("PMD.LongVariable")
     @Parameter(property = "eo.trackOptimizationSteps", required = true, defaultValue = "false")

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/PlaceMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/PlaceMojo.java
@@ -49,8 +49,8 @@
  * Take binary files from where ResolveMojo placed them and
  * copy to target/classes.
  *
- * @since 0.11
  * @see <a href="https://news.eolang.org/2022-10-19-placed-catalog.html">Place catalog</a>
+ * @since 0.11
  */
 @Mojo(
     name = "place",

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/PullMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/PullMojo.java
@@ -87,8 +87,8 @@ public final class PullMojo extends SafeMojo {
 
     /**
      * Pull again even if the .eo file is already present?
-     * @checkstyle MemberNameCheck (7 lines)
      * @since 0.10.0
+     * @checkstyle MemberNameCheck (7 lines)
      */
     @Parameter(property = "eo.overWrite", required = true, defaultValue = "false")
     private boolean overWrite;

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/ResolveMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/ResolveMojo.java
@@ -69,26 +69,26 @@ public final class ResolveMojo extends SafeMojo {
     /**
      * Skip artifact with the version 0.0.0.
      *
-     * @checkstyle MemberNameCheck (7 lines)
      * @since 0.9.0
+     * @checkstyle MemberNameCheck (7 lines)
      */
     @Parameter(property = "eo.skipZeroVersions", required = true, defaultValue = "true")
     private boolean skipZeroVersions;
 
     /**
      * Shall we discover JAR artifacts for .EO sources?
      *
-     * @checkstyle MemberNameCheck (7 lines)
      * @since 0.12.0
+     * @checkstyle MemberNameCheck (7 lines)
      */
     @Parameter(property = "eo.discoverSelf", required = true, defaultValue = "false")
     private boolean discoverSelf;
 
     /**
      * Fail resolution process on conflicting dependencies.
      *
-     * @checkstyle MemberNameCheck (7 lines)
      * @since 1.0
+     * @checkstyle MemberNameCheck (7 lines)
      */
     @Parameter(property = "eo.ignoreVersionConflicts", required = true, defaultValue = "false")
     @SuppressWarnings("PMD.LongVariable")

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/SafeMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/SafeMojo.java
@@ -123,9 +123,9 @@ abstract class SafeMojo extends AbstractMojo {
     /**
      * The path to a text file where paths of all added
      * .class (and maybe others) files are placed.
+     * @since 0.11.0
      * @checkstyle MemberNameCheck (7 lines)
      * @checkstyle VisibilityModifierCheck (10 lines)
-     * @since 0.11.0
      */
     @Parameter(
         property = "eo.placed",
@@ -144,9 +144,9 @@ abstract class SafeMojo extends AbstractMojo {
 
     /**
      * The path to a text file where paths of generated java files per EO program.
+     * @since 0.11.0
      * @checkstyle MemberNameCheck (7 lines)
      * @checkstyle VisibilityModifierCheck (10 lines)
-     * @since 0.11.0
      */
     @Parameter(
         property = "eo.transpiled",
@@ -157,8 +157,8 @@ abstract class SafeMojo extends AbstractMojo {
 
     /**
      * Mojo execution timeout in seconds.
-     * @checkstyle VisibilityModifierCheck (10 lines)
      * @since 0.28.12
+     * @checkstyle VisibilityModifierCheck (10 lines)
      */
     @Parameter(property = "eo.timeout")
     protected Integer timeout = Integer.MAX_VALUE;
@@ -174,9 +174,9 @@ abstract class SafeMojo extends AbstractMojo {
     /**
      * If set to TRUE, the exception on exit will be printed in details
      * to the log.
+     * @since 0.29.0
      * @checkstyle MemberNameCheck (7 lines)
      * @checkstyle VisibilityModifierCheck (10 lines)
-     * @since 0.29.0
      */
     @Parameter(property = "eo.unrollExitError")
     protected boolean unrollExitError = true;

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/ShakeMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/ShakeMojo.java
@@ -75,8 +75,8 @@ public final class ShakeMojo extends SafeMojo {
     /**
      * Track optimization steps into intermediate XML files?
      *
-     * @checkstyle MemberNameCheck (7 lines)
      * @since 0.24.0
+     * @checkstyle MemberNameCheck (7 lines)
      */
     @SuppressWarnings("PMD.LongVariable")
     @Parameter(property = "eo.trackOptimizationSteps", required = true, defaultValue = "false")