Skip to content

Commit c72d434

Browse files
pnatashappnatashap
committed
[#1198] update saxon dependency
1 parent 22b661d commit c72d434

File tree

10 files changed

+57
-19
lines changed

10 files changed

+57
-19
lines changed

‎.github/workflows/codecov.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,19 @@ jobs:
88
codecov:
99
runs-on: ubuntu-22.04
1010
steps:
11-
- uses: actions/checkout@v2
12-
- uses: actions/setup-java@v1
11+
- uses: actions/checkout@v4
12+
- uses: actions/setup-java@v4
1313
with:
14+
distribution: 'temurin'
1415
java-version: 20
15-
- uses: actions/cache@v1
16+
- uses: actions/cache@v4
1617
with:
1718
path: ~/.m2/repository
1819
key: maven-${{ hashFiles('**/pom.xml') }}
1920
restore-keys: |
2021
maven-
2122
- run: mvn install -Pjacoco -Dinvoker.skip
22-
- uses: codecov/codecov-action@v1
23+
- uses: codecov/codecov-action@v4
2324
with:
2425
token: ${{ secrets.CODECOV_TOKEN }}
2526
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

‎.github/workflows/mvn.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ jobs:
1515
os: [windows-2022, ubuntu-22.04, macos-12]
1616
java: [11, 20]
1717
steps:
18-
- uses: actions/checkout@v2
19-
- uses: actions/setup-java@v1
18+
- uses: actions/checkout@v4
19+
- uses: actions/setup-java@v4
2020
with:
21+
distribution: 'temurin'
2122
java-version: ${{ matrix.java }}
22-
- uses: actions/cache@v1
23+
- uses: actions/cache@v4
2324
with:
2425
path: ~/.m2/repository
2526
key: ${{ runner.os }}-jdk-${{ matrix.java }}-maven-${{ hashFiles('**/pom.xml') }}

‎.github/workflows/xcop.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ jobs:
77
xcop:
88
runs-on: ubuntu-20.04
99
steps:
10-
- uses: actions/checkout@v2
10+
- uses: actions/checkout@v4
1111
- uses: g4s8/xcop-action@master

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
120120
<dependency>
121121
<groupId>com.jcabi</groupId>
122122
<artifactId>jcabi-aspects</artifactId>
123-
<version>0.24.1</version>
123+
<version>0.26.0</version>
124124
<scope>provided</scope>
125125
</dependency>
126126
<dependency>

‎qulice-checkstyle/pom.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,18 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
7171
<groupId>com.puppycrawl.tools</groupId>
7272
<artifactId>checkstyle</artifactId>
7373
<version>10.9.3</version>
74+
<exclusions>
75+
<exclusion>
76+
<groupId>net.sf.saxon</groupId>
77+
<artifactId>Saxon-HE</artifactId>
78+
</exclusion>
79+
</exclusions>
80+
</dependency>
81+
<dependency>
82+
<groupId>net.sourceforge.saxon</groupId>
83+
<artifactId>saxon</artifactId>
84+
<version>9.1.0.8</version>
85+
<scope>runtime</scope>
7486
</dependency>
7587
<dependency>
7688
<groupId>commons-io</groupId>

‎qulice-checkstyle/src/main/java/com/qulice/checkstyle/CheckstyleValidator.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
*/
3131
package com.qulice.checkstyle;
3232

33-
import com.jcabi.aspects.Tv;
3433
import com.jcabi.log.Logger;
3534
import com.puppycrawl.tools.checkstyle.Checker;
3635
import com.puppycrawl.tools.checkstyle.ConfigurationLoader;
@@ -44,10 +43,7 @@
4443
import java.io.File;
4544
import java.io.IOException;
4645
import java.net.MalformedURLException;
47-
import java.net.URI;
48-
import java.net.URISyntaxException;
4946
import java.net.URL;
50-
import java.nio.file.Path;
5147
import java.nio.file.Paths;
5248
import java.util.Collection;
5349
import java.util.LinkedList;
@@ -215,7 +211,7 @@ private String header() {
215211
} catch (final IOException ex) {
216212
throw new IllegalStateException("Failed to read license", ex);
217213
}
218-
final StringBuilder builder = new StringBuilder(Tv.HUNDRED);
214+
final StringBuilder builder = new StringBuilder(100);
219215
final String eol = System.getProperty("line.separator");
220216
builder.append("/*").append(eol);
221217
for (final String line

‎qulice-checkstyle/src/test/java/com/qulice/checkstyle/CheckstyleValidatorTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
package com.qulice.checkstyle;
3232

3333
import com.google.common.base.Joiner;
34-
import com.jcabi.aspects.Tv;
3534
import com.qulice.spi.Environment;
3635
import com.qulice.spi.Violation;
3736
import java.io.File;
@@ -366,7 +365,7 @@ public void allowsOnlyProperlyNamedLocalVariables() throws Exception {
366365
final Collection<Violation> results = this.runValidation(
367366
file, false
368367
);
369-
MatcherAssert.assertThat(results, Matchers.hasSize(Tv.TEN));
368+
MatcherAssert.assertThat(results, Matchers.hasSize(10));
370369
MatcherAssert.assertThat(
371370
results,
372371
Matchers.allOf(
@@ -583,7 +582,7 @@ public void distinguishesValidCatchParameterNames() throws Exception {
583582
final Collection<Violation> results = this.runValidation(
584583
file, false
585584
);
586-
MatcherAssert.assertThat(results, Matchers.hasSize(Tv.THREE));
585+
MatcherAssert.assertThat(results, Matchers.hasSize(3));
587586
final String name = "CatchParameterNameCheck";
588587
MatcherAssert.assertThat(
589588
results,

‎qulice-checkstyle/src/test/java/com/qulice/checkstyle/License.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
*/
3131
package com.qulice.checkstyle;
3232

33-
import com.jcabi.aspects.Tv;
3433
import java.io.File;
3534
import java.io.IOException;
3635
import java.nio.charset.StandardCharsets;
@@ -132,7 +131,7 @@ public File file() throws IOException {
132131
@SuppressWarnings("PMD.AvoidDuplicateLiterals")
133132
private void makePackageInfo(final File dir) throws IOException {
134133
final File info = new File(dir, "package-info.java");
135-
final StringBuilder body = new StringBuilder(Tv.HUNDRED);
134+
final StringBuilder body = new StringBuilder(100);
136135
body.append("/*").append(this.eol);
137136
for (final String line : this.lines) {
138137
body.append(" *");

‎qulice-maven-plugin/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,12 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
237237
<groupId>net.sourceforge.pmd</groupId>
238238
<artifactId>pmd-core</artifactId>
239239
<version>6.10.0</version>
240+
<exclusions>
241+
<exclusion>
242+
<groupId>net.sourceforge.saxon</groupId>
243+
<artifactId>saxon</artifactId>
244+
</exclusion>
245+
</exclusions>
240246
</dependency>
241247
<dependency>
242248
<groupId>org.slf4j</groupId>

‎qulice-pmd/pom.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,41 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
6666
<groupId>net.sourceforge.pmd</groupId>
6767
<artifactId>pmd-core</artifactId>
6868
<version>6.10.0</version>
69+
<exclusions>
70+
<exclusion>
71+
<groupId>net.sf.saxon</groupId>
72+
<artifactId>Saxon-HE</artifactId>
73+
</exclusion>
74+
</exclusions>
6975
</dependency>
7076
<dependency>
7177
<groupId>net.sourceforge.pmd</groupId>
7278
<artifactId>pmd-java</artifactId>
7379
<version>6.10.0</version>
80+
<exclusions>
81+
<exclusion>
82+
<groupId>net.sf.saxon</groupId>
83+
<artifactId>Saxon-HE</artifactId>
84+
</exclusion>
85+
</exclusions>
7486
</dependency>
7587
<dependency>
7688
<groupId>net.sourceforge.pmd</groupId>
7789
<artifactId>pmd-jsp</artifactId>
7890
<version>6.10.0</version>
7991
<scope>runtime</scope>
92+
<exclusions>
93+
<exclusion>
94+
<groupId>net.sf.saxon</groupId>
95+
<artifactId>Saxon-HE</artifactId>
96+
</exclusion>
97+
</exclusions>
98+
</dependency>
99+
<dependency>
100+
<groupId>net.sourceforge.saxon</groupId>
101+
<artifactId>saxon</artifactId>
102+
<version>9.1.0.8</version>
103+
<scope>runtime</scope>
80104
</dependency>
81105
<dependency>
82106
<groupId>org.hamcrest</groupId>

0 commit comments

Comments
 (0)