Skip to content

Commit 94b2f72

Browse files
authored
Merge pull request #126 from mbien/dependency-updates-3
Dependency updates (JDK 21 compatibility)
2 parents 811b0fe + 047daf5 commit 94b2f72

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
strategy:
3333
fail-fast: false
3434
matrix:
35-
java: [ '11', '17', '20' ]
35+
java: [ '11', '17', '21-ea' ]
3636

3737
steps:
3838
- name: Set up JDK ${{ matrix.java }}

app/pom.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,23 @@ limitations under the License.
4040
<jstl.version>1.2</jstl.version>
4141
<angular.version>1.7.8</angular.version>
4242
<ant.version>1.10.13</ant.version>
43-
<asm.version>9.4</asm.version>
43+
<asm.version>9.5</asm.version>
4444
<bouncycastle.version>1.70</bouncycastle.version>
4545
<commons-validator.version>1.7</commons-validator.version>
4646
<commons-beanutils.version>1.9.4</commons-beanutils.version>
4747
<commons-codec.version>1.15</commons-codec.version>
48-
<eclipse-link.version>4.0.1</eclipse-link.version>
49-
<guice.version>5.1.0</guice.version>
48+
<eclipse-link.version>4.0.2</eclipse-link.version>
49+
<guice.version>6.0.0</guice.version>
5050
<log4j2.version>2.20.0</log4j2.version>
51-
<lucene.version>9.5.0</lucene.version>
51+
<lucene.version>9.6.0</lucene.version>
5252
<oauth-core.version>20100527</oauth-core.version>
5353
<maven-war.version>3.3.2</maven-war.version>
5454
<maven-surefire.version>2.22.2</maven-surefire.version>
5555
<maven-antrun.version>1.0b3</maven-antrun.version>
5656
<rome.version>1.19.0</rome.version> <!-- locked in place since next version removes popono -->
5757
<slf4j.version>1.7.36</slf4j.version>
58-
<spring.version>5.3.25</spring.version>
59-
<spring.security.version>5.8.2</spring.security.version>
58+
<spring.version>5.3.27</spring.version>
59+
<spring.security.version>5.8.3</spring.security.version>
6060
<struts.version>2.5.29</struts.version>
6161
<velocity.version>2.3</velocity.version>
6262
<webjars.version>1.6</webjars.version>
@@ -260,13 +260,13 @@ limitations under the License.
260260
<dependency>
261261
<groupId>org.webjars</groupId>
262262
<artifactId>clipboard.js</artifactId>
263-
<version>2.0.6</version>
263+
<version>2.0.11</version>
264264
</dependency>
265265

266266
<dependency>
267267
<groupId>org.webjars</groupId>
268268
<artifactId>jquery</artifactId>
269-
<version>3.6.1</version>
269+
<version>3.6.4</version>
270270
</dependency>
271271

272272
<dependency>
@@ -591,14 +591,14 @@ limitations under the License.
591591
<dependency>
592592
<groupId>org.mockito</groupId>
593593
<artifactId>mockito-core</artifactId>
594-
<version>3.2.4</version>
594+
<version>3.12.4</version>
595595
<scope>test</scope>
596596
</dependency>
597597

598598
<dependency>
599599
<groupId>org.instancio</groupId>
600600
<artifactId>instancio-junit</artifactId>
601-
<version>2.9.0</version>
601+
<version>2.16.0</version>
602602
<scope>test</scope>
603603
</dependency>
604604

@@ -843,7 +843,7 @@ limitations under the License.
843843
<plugin>
844844
<groupId>org.codehaus.mojo</groupId>
845845
<artifactId>buildnumber-maven-plugin</artifactId>
846-
<version>3.0.0</version>
846+
<version>3.1.0</version>
847847
<executions>
848848
<execution>
849849
<phase>validate</phase>

app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ You can override it with your own file via WEB-INF/tiles-def.xml
55

66
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
77

8-
<script src="<s:url value='/webjars/jquery/3.6.1/jquery.min.js' />"></script>
8+
<script src="<s:url value='/webjars/jquery/3.6.4/jquery.min.js' />"></script>
99

1010
<script src="<s:url value='/webjars/jquery-ui/1.13.2/jquery-ui.min.js' />"></script>
1111
<link href="<s:url value='/webjars/jquery-ui/1.13.2/jquery-ui.css' />" rel="stylesheet" />
@@ -16,7 +16,7 @@ You can override it with your own file via WEB-INF/tiles-def.xml
1616
<link href="<s:url value='/webjars/bootstrap/3.4.1/css/bootstrap-theme.min.css' />" rel="stylesheet" />
1717
<script src="<s:url value='/webjars/bootstrap/3.4.1/js/bootstrap.min.js' />"></script>
1818

19-
<script src="<s:url value='/webjars/clipboard.js/2.0.6/clipboard.min.js' />"></script>
19+
<script src="<s:url value='/webjars/clipboard.js/2.0.11/clipboard.min.js' />"></script>
2020

2121
<script src="<s:url value='/webjars/summernote/0.8.12/dist/summernote.min.js' />"></script>
2222
<link href="<s:url value='/webjars/summernote/0.8.12/dist/summernote.css' />" rel="stylesheet" />

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ limitations under the License.
4444
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4545
<derby.version>10.11.1.1</derby.version>
4646
<jaxb.version>2.3.1</jaxb.version>
47-
<jetty.version>10.0.14</jetty.version>
47+
<jetty.version>10.0.15</jetty.version>
4848
<roller.version>6.1.2-SNAPSHOT</roller.version>
4949
</properties>
5050

@@ -113,7 +113,7 @@ limitations under the License.
113113
<dependency>
114114
<groupId>org.junit.jupiter</groupId>
115115
<artifactId>junit-jupiter-engine</artifactId>
116-
<version>5.9.2</version>
116+
<version>5.9.3</version>
117117
<scope>test</scope>
118118
</dependency>
119119
</dependencies>

0 commit comments

Comments
 (0)