[yegor256#1198] update saxon dependency

pnatashap · Mar 11, 2024 · c72d434 · c72d434
1 parent 22b661d
commit c72d434
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 19 deletions.
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -8,18 +8,19 @@ jobs:
   codecov:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
+          distribution: 'temurin'
           java-version: 20
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             maven-
       - run: mvn install -Pjacoco -Dinvoker.skip
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: qulice-spi/target/site/jacoco/jacoco.xml,qulice-checkstyle/target/site/jacoco/jacoco.xml,qulice-pmd/target/site/jacoco/jacoco.xml,qulice-ant/target/site/jacoco/jacoco.xml,qulice-maven-plugin/target/site/jacoco/jacoco.xml

diff --git a/.github/workflows/mvn.yml b/.github/workflows/mvn.yml
@@ -15,11 +15,12 @@ jobs:
         os: [windows-2022, ubuntu-22.04, macos-12]
         java: [11, 20]
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
+          distribution: 'temurin'
           java-version: ${{ matrix.java }}
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-jdk-${{ matrix.java }}-maven-${{ hashFiles('**/pom.xml') }}

diff --git a/.github/workflows/xcop.yml b/.github/workflows/xcop.yml
@@ -7,5 +7,5 @@ jobs:
   xcop:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: g4s8/xcop-action@master
diff --git a/pom.xml b/pom.xml
@@ -120,7 +120,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
       <dependency>
         <groupId>com.jcabi</groupId>
         <artifactId>jcabi-aspects</artifactId>
-        <version>0.24.1</version>
+        <version>0.26.0</version>
         <scope>provided</scope>
       </dependency>
       <dependency>

diff --git a/qulice-checkstyle/pom.xml b/qulice-checkstyle/pom.xml
@@ -71,6 +71,18 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
       <groupId>com.puppycrawl.tools</groupId>
       <artifactId>checkstyle</artifactId>
       <version>10.9.3</version>
+      <exclusions>
+        <exclusion>
+          <groupId>net.sf.saxon</groupId>
+          <artifactId>Saxon-HE</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.saxon</groupId>
+      <artifactId>saxon</artifactId>
+      <version>9.1.0.8</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>

diff --git a/qulice-checkstyle/src/main/java/com/qulice/checkstyle/CheckstyleValidator.java b/qulice-checkstyle/src/main/java/com/qulice/checkstyle/CheckstyleValidator.java
@@ -30,7 +30,6 @@
  */
 package com.qulice.checkstyle;
 
-import com.jcabi.aspects.Tv;
 import com.jcabi.log.Logger;
 import com.puppycrawl.tools.checkstyle.Checker;
 import com.puppycrawl.tools.checkstyle.ConfigurationLoader;
@@ -44,10 +43,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.URL;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collection;
 import java.util.LinkedList;
@@ -215,7 +211,7 @@ private String header() {
         } catch (final IOException ex) {
             throw new IllegalStateException("Failed to read license", ex);
         }
-        final StringBuilder builder = new StringBuilder(Tv.HUNDRED);
+        final StringBuilder builder = new StringBuilder(100);
         final String eol = System.getProperty("line.separator");
         builder.append("/*").append(eol);
         for (final String line

diff --git a/qulice-checkstyle/src/test/java/com/qulice/checkstyle/CheckstyleValidatorTest.java b/qulice-checkstyle/src/test/java/com/qulice/checkstyle/CheckstyleValidatorTest.java
@@ -31,7 +31,6 @@
 package com.qulice.checkstyle;
 
 import com.google.common.base.Joiner;
-import com.jcabi.aspects.Tv;
 import com.qulice.spi.Environment;
 import com.qulice.spi.Violation;
 import java.io.File;
@@ -366,7 +365,7 @@ public void allowsOnlyProperlyNamedLocalVariables() throws Exception {
         final Collection<Violation> results = this.runValidation(
             file, false
         );
-        MatcherAssert.assertThat(results, Matchers.hasSize(Tv.TEN));
+        MatcherAssert.assertThat(results, Matchers.hasSize(10));
         MatcherAssert.assertThat(
             results,
             Matchers.allOf(
@@ -583,7 +582,7 @@ public void distinguishesValidCatchParameterNames() throws Exception {
         final Collection<Violation> results = this.runValidation(
             file, false
         );
-        MatcherAssert.assertThat(results, Matchers.hasSize(Tv.THREE));
+        MatcherAssert.assertThat(results, Matchers.hasSize(3));
         final String name = "CatchParameterNameCheck";
         MatcherAssert.assertThat(
             results,

diff --git a/qulice-checkstyle/src/test/java/com/qulice/checkstyle/License.java b/qulice-checkstyle/src/test/java/com/qulice/checkstyle/License.java
@@ -30,7 +30,6 @@
  */
 package com.qulice.checkstyle;
 
-import com.jcabi.aspects.Tv;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -132,7 +131,7 @@ public File file() throws IOException {
     @SuppressWarnings("PMD.AvoidDuplicateLiterals")
     private void makePackageInfo(final File dir) throws IOException {
         final File info = new File(dir, "package-info.java");
-        final StringBuilder body = new StringBuilder(Tv.HUNDRED);
+        final StringBuilder body = new StringBuilder(100);
         body.append("/*").append(this.eol);
         for (final String line : this.lines) {
             body.append(" *");

diff --git a/qulice-maven-plugin/pom.xml b/qulice-maven-plugin/pom.xml
@@ -237,6 +237,12 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
       <groupId>net.sourceforge.pmd</groupId>
       <artifactId>pmd-core</artifactId>
       <version>6.10.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>net.sourceforge.saxon</groupId>
+          <artifactId>saxon</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

diff --git a/qulice-pmd/pom.xml b/qulice-pmd/pom.xml
@@ -66,17 +66,41 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
       <groupId>net.sourceforge.pmd</groupId>
       <artifactId>pmd-core</artifactId>
       <version>6.10.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>net.sf.saxon</groupId>
+          <artifactId>Saxon-HE</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.pmd</groupId>
       <artifactId>pmd-java</artifactId>
       <version>6.10.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>net.sf.saxon</groupId>
+          <artifactId>Saxon-HE</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.pmd</groupId>
       <artifactId>pmd-jsp</artifactId>
       <version>6.10.0</version>
       <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>net.sf.saxon</groupId>
+          <artifactId>Saxon-HE</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.saxon</groupId>
+      <artifactId>saxon</artifactId>
+      <version>9.1.0.8</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>