Skip to content

Commit dafd8a7

Browse files
yegor256yegor256
committed
Merge branch 'master' of github.com:yegor256/qulice
2 parents 030e8e5 + bf06068 commit dafd8a7

File tree

7 files changed

+52
-39
lines changed

7 files changed

+52
-39
lines changed

‎pom.xml‎

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.jcabi</groupId>
1010
<artifactId>parent</artifactId>
11-
<version>0.67.0</version>
11+
<version>0.69.6</version>
1212
</parent>
1313
<groupId>com.qulice</groupId>
1414
<artifactId>qulice</artifactId>
@@ -73,18 +73,18 @@
7373
<dependency>
7474
<groupId>org.projectlombok</groupId>
7575
<artifactId>lombok</artifactId>
76-
<version>1.18.34</version>
76+
<version>1.18.40</version>
7777
<scope>provided</scope>
7878
</dependency>
7979
<dependency>
8080
<groupId>com.jcabi</groupId>
8181
<artifactId>jcabi-xml</artifactId>
82-
<version>0.29.0</version>
82+
<version>0.35.0</version>
8383
</dependency>
8484
<dependency>
8585
<groupId>com.jcabi</groupId>
8686
<artifactId>jcabi-log</artifactId>
87-
<version>0.24.1</version>
87+
<version>0.24.3</version>
8888
</dependency>
8989
<dependency>
9090
<groupId>com.jcabi</groupId>
@@ -95,7 +95,7 @@
9595
<dependency>
9696
<groupId>com.jcabi</groupId>
9797
<artifactId>jcabi-matchers</artifactId>
98-
<version>1.7.0</version>
98+
<version>1.8.0</version>
9999
<scope>test</scope>
100100
</dependency>
101101
<dependency>
@@ -106,45 +106,57 @@
106106
<dependency>
107107
<groupId>commons-io</groupId>
108108
<artifactId>commons-io</artifactId>
109-
<version>2.16.0</version>
109+
<version>2.20.0</version>
110110
</dependency>
111111
<dependency>
112112
<groupId>org.cactoos</groupId>
113113
<artifactId>cactoos</artifactId>
114-
<version>0.55.0</version>
114+
<version>0.57.0</version>
115115
</dependency>
116116
<dependency>
117117
<groupId>com.google.guava</groupId>
118118
<artifactId>guava</artifactId>
119-
<version>33.2.1-jre</version>
119+
<version>33.4.8-jre</version>
120120
</dependency>
121121
<dependency>
122122
<groupId>com.google.code.gson</groupId>
123123
<artifactId>gson</artifactId>
124-
<version>2.11.0</version>
124+
<version>2.13.1</version>
125125
<scope>runtime</scope>
126126
</dependency>
127127
<dependency>
128128
<groupId>org.ow2.asm</groupId>
129129
<artifactId>asm</artifactId>
130-
<version>9.7</version>
130+
<version>9.8</version>
131+
</dependency>
132+
<dependency>
133+
<groupId>org.junit.jupiter</groupId>
134+
<artifactId>junit-jupiter</artifactId>
135+
<version>5.13.4</version>
136+
<scope>test</scope>
131137
</dependency>
132138
<dependency>
133139
<groupId>org.junit.jupiter</groupId>
134140
<artifactId>junit-jupiter-api</artifactId>
135-
<version>5.10.3</version>
141+
<version>5.13.4</version>
136142
<scope>test</scope>
137143
</dependency>
138144
<dependency>
139145
<groupId>org.junit.jupiter</groupId>
140146
<artifactId>junit-jupiter-engine</artifactId>
141-
<version>5.10.3</version>
147+
<version>5.13.4</version>
142148
<scope>test</scope>
143149
</dependency>
144150
<dependency>
145151
<groupId>org.junit.jupiter</groupId>
146152
<artifactId>junit-jupiter-params</artifactId>
147-
<version>5.10.3</version>
153+
<version>5.13.4</version>
154+
<scope>test</scope>
155+
</dependency>
156+
<dependency>
157+
<groupId>org.junit.platform</groupId>
158+
<artifactId>junit-platform-commons</artifactId>
159+
<version>1.13.4</version>
148160
<scope>test</scope>
149161
</dependency>
150162
<dependency>
@@ -161,8 +173,8 @@
161173
</dependency>
162174
<dependency>
163175
<groupId>org.slf4j</groupId>
164-
<artifactId>slf4j-log4j12</artifactId>
165-
<version>2.0.16</version>
176+
<artifactId>slf4j-reload4j</artifactId>
177+
<version>2.0.17</version>
166178
<scope>test</scope>
167179
</dependency>
168180
<dependency>
@@ -174,7 +186,7 @@
174186
<dependency>
175187
<groupId>org.hibernate.validator</groupId>
176188
<artifactId>hibernate-validator</artifactId>
177-
<version>8.0.1.Final</version>
189+
<version>8.0.3.Final</version>
178190
<scope>test</scope>
179191
</dependency>
180192
</dependencies>

‎qulice-checkstyle/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>com.puppycrawl.tools</groupId>
4646
<artifactId>checkstyle</artifactId>
47-
<version>10.17.0</version>
47+
<version>10.26.1</version>
4848
<exclusions>
4949
<exclusion>
5050
<groupId>net.sf.saxon</groupId>
@@ -66,7 +66,7 @@
6666
<dependency>
6767
<groupId>org.apache.commons</groupId>
6868
<artifactId>commons-lang3</artifactId>
69-
<version>3.16.0</version>
69+
<version>3.18.0</version>
7070
<scope>test</scope>
7171
</dependency>
7272
<dependency>
@@ -86,7 +86,7 @@
8686
</dependency>
8787
<dependency>
8888
<groupId>org.slf4j</groupId>
89-
<artifactId>slf4j-log4j12</artifactId>
89+
<artifactId>slf4j-reload4j</artifactId>
9090
<!-- version from parent -->
9191
</dependency>
9292
<dependency>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ private static boolean tagFound(final Matcher matcher) {
158158
* @return True if str is empty.
159159
*/
160160
private static boolean empty(final String str) {
161-
return str == null || str.isBlank();
161+
return str == null || str.chars().allMatch(Character::isWhitespace);
162162
}
163163

164164
/**

‎qulice-maven-plugin/pom.xml‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,16 @@
2424
<artifactId>qulice-spi</artifactId>
2525
<version>${project.version}</version>
2626
</dependency>
27+
<dependency>
28+
<groupId>javax.inject</groupId>
29+
<artifactId>javax.inject</artifactId>
30+
<version>1</version>
31+
<scope>provided</scope>
32+
</dependency>
2733
<dependency>
2834
<groupId>org.apache.maven.plugin-tools</groupId>
2935
<artifactId>maven-plugin-annotations</artifactId>
30-
<version>3.13.1</version>
36+
<version>3.15.1</version>
3137
<scope>provided</scope>
3238
</dependency>
3339
<dependency>
@@ -131,31 +137,31 @@
131137
<dependency>
132138
<groupId>org.apache.maven</groupId>
133139
<artifactId>maven-core</artifactId>
134-
<version>3.9.8</version>
140+
<version>3.9.11</version>
135141
<scope>provided</scope>
136142
</dependency>
137143
<dependency>
138144
<groupId>org.apache.maven</groupId>
139145
<artifactId>maven-plugin-api</artifactId>
140-
<version>3.9.8</version>
146+
<version>3.9.11</version>
141147
<scope>provided</scope>
142148
</dependency>
143149
<dependency>
144150
<groupId>org.apache.maven</groupId>
145151
<artifactId>maven-model</artifactId>
146-
<version>3.9.8</version>
152+
<version>3.9.11</version>
147153
<scope>provided</scope>
148154
</dependency>
149155
<dependency>
150156
<groupId>org.apache.maven</groupId>
151157
<artifactId>maven-artifact</artifactId>
152-
<version>3.9.8</version>
158+
<version>3.9.11</version>
153159
<scope>provided</scope>
154160
</dependency>
155161
<dependency>
156162
<groupId>org.apache.maven.shared</groupId>
157163
<artifactId>maven-dependency-analyzer</artifactId>
158-
<version>1.14.1</version>
164+
<version>1.16.0</version>
159165
<exclusions>
160166
<exclusion>
161167
<groupId>org.apache.maven</groupId>
@@ -186,7 +192,7 @@
186192
<dependency>
187193
<groupId>org.codehaus.plexus</groupId>
188194
<artifactId>plexus-utils</artifactId>
189-
<version>3.5.1</version>
195+
<version>3.6.0</version>
190196
</dependency>
191197
<dependency>
192198
<groupId>org.codehaus.plexus</groupId>
@@ -213,9 +219,9 @@
213219
</exclusions>
214220
</dependency>
215221
<dependency>
216-
<groupId>org.hibernate</groupId>
222+
<groupId>org.hibernate.validator</groupId>
217223
<artifactId>hibernate-validator</artifactId>
218-
<version>8.0.1.Final</version>
224+
<version>8.0.3.Final</version>
219225
<scope>runtime</scope>
220226
</dependency>
221227
<dependency>
@@ -237,11 +243,6 @@
237243
</exclusion>
238244
</exclusions>
239245
</dependency>
240-
<dependency>
241-
<groupId>org.slf4j</groupId>
242-
<artifactId>slf4j-log4j12</artifactId>
243-
<!-- version from parent -->
244-
</dependency>
245246
<dependency>
246247
<groupId>log4j</groupId>
247248
<artifactId>log4j</artifactId>
@@ -283,7 +284,7 @@
283284
</plugin>
284285
<plugin>
285286
<artifactId>maven-plugin-plugin</artifactId>
286-
<version>3.13.1</version>
287+
<version>3.15.1</version>
287288
<configuration>
288289
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
289290
<checkExpectedProvidedScope>false</checkExpectedProvidedScope>

‎qulice-maven-plugin/src/main/java/com/qulice/maven/AbstractQuliceMojo.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
import com.jcabi.log.Logger;
88
import java.util.Collection;
99
import java.util.LinkedList;
10+
import javax.inject.Inject;
1011
import org.apache.maven.execution.MavenSession;
1112
import org.apache.maven.plugin.AbstractMojo;
1213
import org.apache.maven.plugin.MavenPluginManager;
1314
import org.apache.maven.plugin.MojoFailureException;
14-
import org.apache.maven.plugins.annotations.Component;
1515
import org.apache.maven.plugins.annotations.Parameter;
1616
import org.apache.maven.project.MavenProject;
1717
import org.codehaus.plexus.context.Context;
@@ -47,7 +47,7 @@ public abstract class AbstractQuliceMojo extends AbstractMojo
4747
/**
4848
* Maven plugin manager, to be injected by Maven itself.
4949
*/
50-
@Component
50+
@Inject
5151
private MavenPluginManager manager;
5252

5353
/**

‎qulice-pmd/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
</dependency>
129129
<dependency>
130130
<groupId>org.slf4j</groupId>
131-
<artifactId>slf4j-log4j12</artifactId>
131+
<artifactId>slf4j-reload4j</artifactId>
132132
<!-- version from parent -->
133133
</dependency>
134134
<dependency>

‎qulice-spi/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</dependency>
3737
<dependency>
3838
<groupId>org.slf4j</groupId>
39-
<artifactId>slf4j-log4j12</artifactId>
39+
<artifactId>slf4j-reload4j</artifactId>
4040
<!-- version from parent -->
4141
</dependency>
4242
<dependency>

0 commit comments

Comments
 (0)