Merge branch 'master' into fix/parse-with-new-lines

yegor256 · Jan 30, 2024 · 248f54f · 248f54f
2 parents 6e3bd10 + 64b1562
commit 248f54f
Show file tree

Hide file tree

Showing 70 changed files with 92 additions and 93 deletions.
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -20,7 +20,8 @@ jobs:
           restore-keys: |
             maven-
       - run: mvn install -Pjacoco
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v4.0.0-beta.3
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           file: ./target/site/jacoco/jacoco.xml
           fail_ci_if_error: true
diff --git a/.rultor.yml b/.rultor.yml
@@ -1,5 +1,5 @@
 docker:
-  image: yegor256/rultor-image:1.20.0
+  image: yegor256/rultor-image:1.22.0
 assets:
   secring.gpg: yegor256/home#assets/secring.gpg
   settings.xml: yegor256/home#assets/xembly/settings.xml
@@ -15,6 +15,7 @@ merge:
     mvn clean install -Pxembly -Pqulice --errors --settings ../settings.xml
     mvn clean site -Psite --errors --settings ../settings.xml -Dinvoker.skip
 release:
+  pre: false
   script: |-
     [[ "${tag}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] || exit -1
     mvn versions:set "-DnewVersion=${tag}"

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2023, xembly.org
+Copyright (c) 2013-2024, xembly.org
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-<img alt="logo" src="http://www.xembly.org/logo.png" width="64px" height="64px" />
+<img alt="logo" src="https://www.xembly.org/logo.png" width="64px" height="64px" />
 
 [![EO principles respected here](https://www.elegantobjects.org/badge.svg)](https://www.elegantobjects.org)
 [![DevOps By Rultor.com](http://www.rultor.com/b/yegor256/xembly)](http://www.rultor.com/p/yegor256/xembly)
@@ -12,7 +12,6 @@
 [![Javadoc](http://www.javadoc.io/badge/com.jcabi.incubator/xembly.svg)](http://www.javadoc.io/doc/com.jcabi.incubator/xembly)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.jcabi.incubator/xembly/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.jcabi.incubator/xembly)
 [![Hits-of-Code](https://hitsofcode.com/github/yegor256/xembly)](https://hitsofcode.com/view/github/yegor256/xembly)
-![Lines of code](https://img.shields.io/tokei/lines/github/yegor256/xembly)
 [![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=yegor256_xembly&metric=code_smells)](https://sonarcloud.io/summary/new_code?id=yegor256_xembly)
 
 **Xembly** is an [Assembly](http://en.wikipedia.org/wiki/Assembly_language)-like
@@ -31,7 +30,7 @@ You need this dependency:
 <dependency>
   <groupId>com.jcabi.incubator</groupId>
   <artifactId>xembly</artifactId>
-  <version>0.30.0</version>
+  <version>0.31.0</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright (c) 2013-2023, xembly.org
+Copyright (c) 2013-2024, xembly.org
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -33,7 +33,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
   <parent>
     <groupId>com.jcabi</groupId>
     <artifactId>parent</artifactId>
-    <version>0.66.0</version>
+    <version>0.67.0</version>
   </parent>
   <groupId>com.jcabi.incubator</groupId>
   <artifactId>xembly</artifactId>
@@ -95,23 +95,24 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
       <version>1.18.30</version>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>5.8.0</version>
-      <scope>test</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>xml-apis</groupId>
       <artifactId>xml-apis</artifactId>
       <version>2.0.2</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>5.10.0</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.jcabi</groupId>
       <artifactId>jcabi-aspects</artifactId>
-      <version>0.24.1</version>
+      <version>0.25.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -123,7 +124,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
     <dependency>
       <groupId>com.jcabi</groupId>
       <artifactId>jcabi-log</artifactId>
-      <version>0.23.0</version>
+      <version>0.24.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/src/it/saxon/pom.xml b/src/it/saxon/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright (c) 2013-2023, xembly.org
+Copyright (c) 2013-2024, xembly.org
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -33,7 +33,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
   <parent>
     <groupId>com.jcabi</groupId>
     <artifactId>parent</artifactId>
-    <version>0.66.0</version>
+    <version>0.67.0</version>
   </parent>
   <groupId>org.xembly</groupId>
   <artifactId>saxon</artifactId>

diff --git a/src/it/saxon/src/test/java/org/xembly/saxon/SaxonSampleTest.java b/src/it/saxon/src/test/java/org/xembly/saxon/SaxonSampleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/it/saxon/src/test/java/org/xembly/saxon/package-info.java b/src/it/saxon/src/test/java/org/xembly/saxon/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/it/saxon/src/test/resources/log4j.properties b/src/it/saxon/src/test/resources/log4j.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2023, xembly.org
+# Copyright (c) 2013-2024, xembly.org
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/src/it/settings.xml b/src/it/settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright (c) 2013-2023, xembly.org
+Copyright (c) 2013-2024, xembly.org
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/src/it/xerces/pom.xml b/src/it/xerces/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright (c) 2013-2023, xembly.org
+Copyright (c) 2013-2024, xembly.org
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -33,7 +33,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
   <parent>
     <groupId>com.jcabi</groupId>
     <artifactId>parent</artifactId>
-    <version>0.66.0</version>
+    <version>0.67.0</version>
   </parent>
   <groupId>org.xembly</groupId>
   <artifactId>xerces</artifactId>

diff --git a/src/it/xerces/src/test/java/org/xembly/xerces/XercesSampleTest.java b/src/it/xerces/src/test/java/org/xembly/xerces/XercesSampleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/it/xerces/src/test/java/org/xembly/xerces/package-info.java b/src/it/xerces/src/test/java/org/xembly/xerces/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/it/xerces/src/test/resources/log4j.properties b/src/it/xerces/src/test/resources/log4j.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2023, xembly.org
+# Copyright (c) 2013-2024, xembly.org
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/AddDirective.java b/src/main/java/org/xembly/AddDirective.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/AddIfDirective.java b/src/main/java/org/xembly/AddIfDirective.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/Arg.java b/src/main/java/org/xembly/Arg.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/AttrDirective.java b/src/main/java/org/xembly/AttrDirective.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/Callback.java b/src/main/java/org/xembly/Callback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/CdataDirective.java b/src/main/java/org/xembly/CdataDirective.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/CommentDirective.java b/src/main/java/org/xembly/CommentDirective.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/Directive.java b/src/main/java/org/xembly/Directive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/Directives.java b/src/main/java/org/xembly/Directives.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/DomCursor.java b/src/main/java/org/xembly/DomCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/DomStack.java b/src/main/java/org/xembly/DomStack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/ImpossibleModificationException.java b/src/main/java/org/xembly/ImpossibleModificationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/NsDirective.java b/src/main/java/org/xembly/NsDirective.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/ParsingException.java b/src/main/java/org/xembly/ParsingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/PiDirective.java b/src/main/java/org/xembly/PiDirective.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/PopDirective.java b/src/main/java/org/xembly/PopDirective.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/Print.java b/src/main/java/org/xembly/Print.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/PushDirective.java b/src/main/java/org/xembly/PushDirective.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/RemoveDirective.java b/src/main/java/org/xembly/RemoveDirective.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/SetDirective.java b/src/main/java/org/xembly/SetDirective.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/StrictDirective.java b/src/main/java/org/xembly/StrictDirective.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/SyntaxException.java b/src/main/java/org/xembly/SyntaxException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/Transformers.java b/src/main/java/org/xembly/Transformers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/UpDirective.java b/src/main/java/org/xembly/UpDirective.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/Verbs.java b/src/main/java/org/xembly/Verbs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/XattrDirective.java b/src/main/java/org/xembly/XattrDirective.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/Xembler.java b/src/main/java/org/xembly/Xembler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/XmlContentException.java b/src/main/java/org/xembly/XmlContentException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/org/xembly/XpathDirective.java b/src/main/java/org/xembly/XpathDirective.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2023, xembly.org
+ * Copyright (c) 2013-2024, xembly.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without