Skip to content

Commit 4806680

Browse files
committed
Build with Java 25
Upgrade some testing dependencies and manage their versions in parent
1 parent 72c139b commit 4806680

3 files changed

Lines changed: 12 additions & 4 deletions

File tree

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
vaultPipeline('ubuntu', 11, '3', {
2424
vaultStageSanityCheck()
25-
vaultStageBuild(['Windows'], [17,21], [], 'apache_jackrabbit-filevault',
25+
vaultStageBuild(['Windows'], [17,21,25], [], 'apache_jackrabbit-filevault',
2626
[
2727
simpleCredentialsMap: ['NIST_NVD_API_KEY': 'NIST_NVD_API_KEY'],
2828
mainBuildArguments: '-U clean site deploy -Pjacoco-report,dependency-check -Dlogback.configurationFile=vault-core/src/test/resources/logback-only-errors.xml -DnvdApiKeyEnvironmentVariable=NIST_NVD_API_KEY'

parent/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,16 @@ Bundle-Category: jackrabbit
593593
<type>pom</type>
594594
<scope>import</scope>
595595
</dependency>
596+
<dependency>
597+
<groupId>org.hamcrest</groupId>
598+
<artifactId>hamcrest</artifactId>
599+
<version>3.0</version>
600+
</dependency>
601+
<dependency>
602+
<groupId>org.mockito</groupId>
603+
<artifactId>mockito-core</artifactId>
604+
<version>5.20.0</version>
605+
</dependency>
596606
</dependencies>
597607
</dependencyManagement>
598608

vault-core/pom.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,6 @@
297297
<dependency>
298298
<groupId>org.hamcrest</groupId>
299299
<artifactId>hamcrest</artifactId>
300-
<version>2.2</version>
301300
<scope>test</scope>
302301
</dependency>
303302
<dependency>
@@ -309,7 +308,6 @@
309308
<dependency>
310309
<groupId>org.mockito</groupId>
311310
<artifactId>mockito-core</artifactId>
312-
<version>5.15.2</version>
313311
<scope>test</scope>
314312
</dependency>
315313
<dependency>
@@ -320,7 +318,7 @@
320318
<dependency>
321319
<groupId>org.xmlunit</groupId>
322320
<artifactId>xmlunit-matchers</artifactId>
323-
<version>2.6.0</version>
321+
<version>2.10.4</version>
324322
<scope>test</scope>
325323
</dependency>
326324
<dependency>

0 commit comments

Comments
 (0)