Skip to content

Commit 86b6dec

Browse files
sr4850sr4850
authored
Merge pull request #51 from dvsa/fix/refactor
fix: organise pom, update dependencies
2 parents 96a27a8 + 8ab1a37 commit 86b6dec

14 files changed

Lines changed: 764 additions & 21929 deletions

‎pom.xml‎

Lines changed: 52 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -7,54 +7,51 @@
77
<!-- ========================================== -->
88
<groupId>org.dvsa.testing.lib</groupId>
99
<artifactId>accessibility-library</artifactId>
10-
<version>2.11.3-SNAPSHOT</version>
10+
<version>3.0.0-SNAPSHOT</version>
1111

1212
<!-- ========================================== -->
1313
<!-- Properties -->
1414
<!-- ========================================== -->
1515
<properties>
1616
<!-- Build Configuration -->
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18-
<maven.compiler.source>11</maven.compiler.source>
19-
<maven.compiler.target>11</maven.compiler.target>
20-
<java.version>11</java.version>
18+
<maven.compiler.source>17</maven.compiler.source>
19+
<maven.compiler.target>17</maven.compiler.target>
20+
<maven.compiler.release>17</maven.compiler.release>
21+
<java.version>17</java.version>
2122

2223
<!-- DVSA Internal Libraries -->
2324
<active-support.version>2.11.2</active-support.version>
2425

2526
<!-- Accessibility Testing -->
26-
<axe-selenium-version>4.10.1</axe-selenium-version>
27+
<axe-selenium.version>4.10.2</axe-selenium.version>
2728

28-
<!-- Template Engine -->
29-
<mustache.version>0.9.11</mustache.version>
30-
31-
<!-- WebDriver Management -->
32-
<webdrivermanager.version>6.1.0</webdrivermanager.version>
29+
<!-- Allure Reporting -->
30+
<allure.version>2.29.0</allure.version>
3331

3432
<!-- Logging -->
35-
<slf4j.version>2.0.9</slf4j.version>
36-
<slf4j-log4j12.version>2.25.3</slf4j-log4j12.version>
33+
<log4j.version>2.25.3</log4j.version>
3734

3835
<!-- Apache Commons -->
3936
<commons-beanutils.version>1.11.0</commons-beanutils.version>
4037
<commons-collections.version>4.4</commons-collections.version>
41-
<org.apache.commons.commons-text.version>1.12.0</org.apache.commons.commons-text.version>
42-
<org.apache.commons.commons-compress.version>1.27.1</org.apache.commons.commons-compress.version>
38+
<commons-text.version>1.12.0</commons-text.version>
39+
<commons-compress.version>1.27.1</commons-compress.version>
4340

4441
<!-- XML Processing -->
4542
<dom4j.version>2.1.4</dom4j.version>
4643

4744
<!-- JSON Processing -->
48-
<org.json.version>20240303</org.json.version>
45+
<json.version>20240303</json.version>
4946

5047
<!-- Database -->
51-
<org.postgresql.version>42.7.7</org.postgresql.version>
48+
<postgresql.version>42.7.7</postgresql.version>
5249

5350
<!-- YAML Processing -->
54-
<org.yaml.snakeyaml.version>2.1</org.yaml.snakeyaml.version>
51+
<snakeyaml.version>2.2</snakeyaml.version>
5552

5653
<!-- Amazon Ion -->
57-
<software.amazon.ion.version>1.11.0</software.amazon.ion.version>
54+
<ion-java.version>1.11.11</ion-java.version>
5855

5956
<!-- Security/Cryptography -->
6057
<bouncycastle.version>1.79</bouncycastle.version>
@@ -74,7 +71,7 @@
7471
<artifactId>maven-compiler-plugin</artifactId>
7572
<version>3.13.0</version>
7673
<configuration>
77-
<release>11</release>
74+
<release>${maven.compiler.release}</release>
7875
</configuration>
7976
</plugin>
8077
</plugins>
@@ -122,12 +119,16 @@
122119
</profile>
123120
</profiles>
124121

122+
<!-- ========================================== -->
123+
<!-- Dependency Management -->
124+
<!-- ========================================== -->
125125
<dependencyManagement>
126126
<dependencies>
127+
<!-- Netty Version Management -->
127128
<dependency>
128129
<groupId>io.netty</groupId>
129130
<artifactId>netty-codec-http2</artifactId>
130-
<version>4.1.125.Final</version>
131+
<version>4.1.129.Final</version>
131132
</dependency>
132133
<dependency>
133134
<groupId>io.netty</groupId>
@@ -139,6 +140,13 @@
139140
<artifactId>netty-common</artifactId>
140141
<version>4.1.129.Final</version>
141142
</dependency>
143+
144+
<!-- Override vulnerable webdrivermanager version -->
145+
<dependency>
146+
<groupId>io.github.bonigarcia</groupId>
147+
<artifactId>webdrivermanager</artifactId>
148+
<version>6.1.0</version>
149+
</dependency>
142150
</dependencies>
143151
</dependencyManagement>
144152

@@ -151,7 +159,6 @@
151159
<!-- DVSA Internal Libraries -->
152160
<!-- ====================================== -->
153161

154-
155162
<!-- Active Support - DVSA Test Framework -->
156163
<dependency>
157164
<groupId>org.dvsa.testing.lib</groupId>
@@ -167,29 +174,36 @@
167174
<dependency>
168175
<groupId>com.deque.html.axe-core</groupId>
169176
<artifactId>selenium</artifactId>
170-
<version>${axe-selenium-version}</version>
177+
<version>${axe-selenium.version}</version>
171178
</dependency>
172179

173180
<!-- ====================================== -->
174-
<!-- WebDriver Management -->
181+
<!-- Reporting -->
175182
<!-- ====================================== -->
176183

177-
<!-- WebDriverManager - Browser Driver Management -->
184+
<!-- Allure Java Commons - Test Reporting -->
178185
<dependency>
179-
<groupId>io.github.bonigarcia</groupId>
180-
<artifactId>webdrivermanager</artifactId>
181-
<version>${webdrivermanager.version}</version>
186+
<groupId>io.qameta.allure</groupId>
187+
<artifactId>allure-java-commons</artifactId>
188+
<version>${allure.version}</version>
182189
</dependency>
183190

184191
<!-- ====================================== -->
185-
<!-- Template Engine -->
192+
<!-- Logging -->
186193
<!-- ====================================== -->
187194

188-
<!-- Mustache Java - Template Processing -->
195+
<!-- Log4j API - Logging Facade -->
196+
<dependency>
197+
<groupId>org.apache.logging.log4j</groupId>
198+
<artifactId>log4j-api</artifactId>
199+
<version>${log4j.version}</version>
200+
</dependency>
201+
202+
<!-- Log4j Core - Logging Implementation -->
189203
<dependency>
190-
<groupId>com.github.spullara.mustache.java</groupId>
191-
<artifactId>compiler</artifactId>
192-
<version>${mustache.version}</version>
204+
<groupId>org.apache.logging.log4j</groupId>
205+
<artifactId>log4j-core</artifactId>
206+
<version>${log4j.version}</version>
193207
</dependency>
194208

195209
<!-- ====================================== -->
@@ -214,14 +228,14 @@
214228
<dependency>
215229
<groupId>org.apache.commons</groupId>
216230
<artifactId>commons-text</artifactId>
217-
<version>${org.apache.commons.commons-text.version}</version>
231+
<version>${commons-text.version}</version>
218232
</dependency>
219233

220234
<!-- Commons Compress - Archive Processing -->
221235
<dependency>
222236
<groupId>org.apache.commons</groupId>
223237
<artifactId>commons-compress</artifactId>
224-
<version>${org.apache.commons.commons-compress.version}</version>
238+
<version>${commons-compress.version}</version>
225239
</dependency>
226240

227241
<!-- ====================================== -->
@@ -239,21 +253,21 @@
239253
<dependency>
240254
<groupId>org.json</groupId>
241255
<artifactId>json</artifactId>
242-
<version>${org.json.version}</version>
256+
<version>${json.version}</version>
243257
</dependency>
244258

245259
<!-- SnakeYAML - YAML Processing -->
246260
<dependency>
247261
<groupId>org.yaml</groupId>
248262
<artifactId>snakeyaml</artifactId>
249-
<version>${org.yaml.snakeyaml.version}</version>
263+
<version>${snakeyaml.version}</version>
250264
</dependency>
251265

252266
<!-- Amazon Ion - Ion Data Format -->
253267
<dependency>
254268
<groupId>com.amazon.ion</groupId>
255269
<artifactId>ion-java</artifactId>
256-
<version>${software.amazon.ion.version}</version>
270+
<version>${ion-java.version}</version>
257271
</dependency>
258272

259273
<!-- ====================================== -->
@@ -264,7 +278,7 @@
264278
<dependency>
265279
<groupId>org.postgresql</groupId>
266280
<artifactId>postgresql</artifactId>
267-
<version>${org.postgresql.version}</version>
281+
<version>${postgresql.version}</version>
268282
</dependency>
269283

270284
<!-- ====================================== -->
@@ -278,19 +292,6 @@
278292
<version>${bouncycastle.version}</version>
279293
</dependency>
280294

281-
<!-- ====================================== -->
282-
<!-- Logging -->
283-
<!-- ====================================== -->
284-
285-
<!-- Log4j Core - Logging Implementation -->
286-
<dependency>
287-
<groupId>org.apache.logging.log4j</groupId>
288-
<artifactId>log4j-core</artifactId>
289-
<version>${slf4j-log4j12.version}</version>
290-
</dependency>
291-
292-
293-
294295
</dependencies>
295296

296297
</project>

0 commit comments

Comments
 (0)