Skip to content

Commit c7064c3

Browse files
authored
Merge pull request #439 from apache/refactoring/438-Upgrade-dependencies
Issue #438: Upgrade dependencies (3.6.1)
2 parents 79f6f85 + 80eb2cf commit c7064c3

File tree

7 files changed

+28
-28
lines changed

7 files changed

+28
-28
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@
408408
<plugin>
409409
<groupId>org.owasp</groupId>
410410
<artifactId>dependency-check-maven</artifactId>
411-
<version>11.1.0</version>
411+
<version>12.1.5</version>
412412
<executions>
413413
<execution>
414414
<goals><goal>check</goal></goals>

src/main/assembly/bin-without-jackson.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ under the License.
210210
<include>org.springframework:spring-context</include>
211211
<include>org.springframework:spring-core</include>
212212
<include>org.springframework:spring-expression</include>
213-
<include>org.springframework:spring-jcl/5.3.39/spring-jcl-5.3.39.jar</include>
213+
<include>org.springframework:spring-jcl</include>
214214
</includes>
215215
<unpack>false</unpack>
216216
<scope>runtime</scope>

src/main/bin_distr_license_notices/LICENSE.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,9 +267,9 @@ Copyright (c) 2004-2017 QOS.ch
267267

268268
=======================================================================
269269

270-
SPRING FRAMEWORK 6.1.15 SUBCOMPONENTS:
270+
SPRING FRAMEWORK 6.2.11 SUBCOMPONENTS:
271271

272-
Spring Framework 6.1.15 includes a number of subcomponents
272+
Spring Framework 6.2.11 includes a number of subcomponents
273273
with separate copyright notices and license terms. The product that
274274
includes this file does not necessarily use all the open source
275275
subcomponents referred to below. Your use of the source

src/main/bin_distr_license_notices/NOTICE-without-jackson.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ ResolverUtil.java Copyright 2005-2006 Tim Fennell
1717
# Apache Commons IO
1818

1919
Apache Commons IO
20-
Copyright 2002-2024 The Apache Software Foundation
20+
Copyright 2002-2025 The Apache Software Foundation
2121

2222
# Apache Commons Lang
2323

2424
Apache Commons Lang
25-
Copyright 2001-2024 The Apache Software Foundation
25+
Copyright 2001-2025 The Apache Software Foundation
2626

2727
# Spring Framework
2828

29-
Copyright (c) 2002-2024 Pivotal, Inc.
29+
Copyright (c) 2002-2025 Pivotal, Inc.
3030

3131
This product is licensed to you under the Apache License, Version 2.0
3232
(the "License"). You may not use this product except in compliance with

src/main/bin_distr_license_notices/NOTICE.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ ResolverUtil.java Copyright 2005-2006 Tim Fennell
1717
# Apache Commons IO
1818

1919
Apache Commons IO
20-
Copyright 2002-2024 The Apache Software Foundation
20+
Copyright 2002-2025 The Apache Software Foundation
2121

2222
# Apache Commons Lang
2323

2424
Apache Commons Lang
25-
Copyright 2001-2024 The Apache Software Foundation
25+
Copyright 2001-2025 The Apache Software Foundation
2626

27-
# Jackson JSON processor NOTICE from the Jackson Jar 2.15.2
27+
# Jackson JSON processor NOTICE from the Jackson Jar 2.20.0
2828

2929
Jackson is a high-performance, Free/Open Source JSON processing library.
3030
It was originally written by Tatu Saloranta ([email protected]), and has
@@ -59,7 +59,7 @@ and the licenses and copyrights that apply to that code.
5959

6060
# Spring Framework
6161

62-
Copyright (c) 2002-2024 Pivotal, Inc.
62+
Copyright (c) 2002-2025 Pivotal, Inc.
6363

6464
This product is licensed to you under the Apache License, Version 2.0
6565
(the "License"). You may not use this product except in compliance with

uimafit-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<dependency>
9090
<groupId>com.google.guava</groupId>
9191
<artifactId>guava</artifactId>
92-
<version>33.2.0-jre</version>
92+
<version>33.5.0-jre</version>
9393
</dependency>
9494
</dependencies>
9595

uimaj-parent-internal/pom.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,30 +56,30 @@
5656

5757
<maven.version>3.8.1</maven.version>
5858

59-
<asciidoctor.plugin.version>3.1.1</asciidoctor.plugin.version>
59+
<asciidoctor.plugin.version>3.2.0</asciidoctor.plugin.version>
6060
<asciidoctor.version>3.0.0</asciidoctor.version>
6161
<asciidoctor.pdf.version>2.3.19</asciidoctor.pdf.version>
62-
<assertj-version>3.26.3</assertj-version>
63-
<bnd-version>7.0.0</bnd-version>
64-
<bytebuddy-version>1.15.10</bytebuddy-version>
65-
<commons-csv-version>1.12.0</commons-csv-version>
66-
<commons-collections4-version>4.4</commons-collections4-version>
67-
<commons-io-version>2.18.0</commons-io-version>
68-
<commons-lang3-version>3.17.0</commons-lang3-version>
62+
<assertj-version>3.27.5</assertj-version>
63+
<bnd-version>7.1.0</bnd-version>
64+
<bytebuddy-version>1.17.7</bytebuddy-version>
65+
<commons-csv-version>1.14.1</commons-csv-version>
66+
<commons-collections4-version>4.5.0</commons-collections4-version>
67+
<commons-io-version>2.20.0</commons-io-version>
68+
<commons-lang3-version>3.18.0</commons-lang3-version>
6969
<commons-math3-version>3.6.1</commons-math3-version>
70-
<jackson-version>2.18.1</jackson-version>
70+
<jackson-version>2.20.0</jackson-version>
7171
<javassist-version>3.30.2-GA</javassist-version>
72-
<junit-version>5.11.3</junit-version>
73-
<junit-platform-version>1.11.3</junit-platform-version>
72+
<junit-version>5.11.4</junit-version>
73+
<junit-platform-version>1.11.4</junit-platform-version>
7474
<junit-vintage-version>4.13.2</junit-vintage-version>
75-
<log4j-version>2.24.1</log4j-version>
76-
<mockito-version>5.14.2</mockito-version>
75+
<log4j-version>2.25.2</log4j-version>
76+
<mockito-version>5.18.0</mockito-version>
7777
<opentest4j-version>1.3.0</opentest4j-version>
7878
<qdox-version>2.1.0</qdox-version>
7979
<slf4j-version>1.7.36</slf4j-version>
80-
<spring-version>6.1.15</spring-version>
81-
<tycho-version>4.0.10</tycho-version>
82-
<xmlunit-version>2.10.0</xmlunit-version>
80+
<spring-version>6.2.11</spring-version>
81+
<tycho-version>4.0.13</tycho-version>
82+
<xmlunit-version>2.10.4</xmlunit-version>
8383

8484
<eclipseP2RepoId>org.eclipse.p2.202209</eclipseP2RepoId>
8585

0 commit comments

Comments
 (0)