Skip to content

Commit d087041

Browse files
committed
Merge branch 'release/3.2.3'
2 parents bdd2bce + 1874145 commit d087041

66 files changed

Lines changed: 91 additions & 69 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

pom.xml

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>eu.openanalytics</groupId>
77
<artifactId>shinyproxy</artifactId>
8-
<version>3.2.2</version>
8+
<version>3.2.3</version>
99
<packaging>jar</packaging>
1010
<inceptionYear>2016</inceptionYear>
1111

@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.springframework.boot</groupId>
2222
<artifactId>spring-boot-starter-parent</artifactId>
23-
<version>3.4.11</version>
23+
<version>3.4.13</version>
2424
<relativePath/>
2525
</parent>
2626

@@ -31,8 +31,8 @@
3131
<maven.compiler.target>21</maven.compiler.target>
3232
<resource.delimiter>&amp;</resource.delimiter>
3333
<!-- Dependency versions -->
34-
<containerproxy.version>1.2.2</containerproxy.version>
35-
<spring-boot.version>3.4.11</spring-boot.version>
34+
<containerproxy.version>1.2.3</containerproxy.version>
35+
<spring-boot.version>3.4.13</spring-boot.version>
3636
<datatables.version>1.13.5</datatables.version>
3737
<datatables-buttons.version>2.4.1</datatables-buttons.version>
3838
<datatables-responsive.version>2.2.7</datatables-responsive.version>
@@ -155,6 +155,28 @@
155155
<artifactId>junit-platform-launcher</artifactId>
156156
<scope>test</scope>
157157
</dependency>
158+
159+
<!-- Transitive dependencies updated for security -->
160+
<dependency>
161+
<groupId>io.undertow</groupId>
162+
<artifactId>undertow-core</artifactId>
163+
<version>2.3.21.Final</version>
164+
</dependency>
165+
<dependency>
166+
<groupId>io.undertow</groupId>
167+
<artifactId>undertow-servlet</artifactId>
168+
<version>2.3.21.Final</version>
169+
</dependency>
170+
<dependency>
171+
<groupId>io.undertow</groupId>
172+
<artifactId>undertow-websockets-jsr</artifactId>
173+
<version>2.3.21.Final</version>
174+
</dependency>
175+
<dependency>
176+
<groupId>org.apache.logging.log4j</groupId>
177+
<artifactId>log4j-api</artifactId>
178+
<version>2.25.3</version>
179+
</dependency>
158180
</dependencies>
159181

160182
<build>

src/main/java/eu/openanalytics/shinyproxy/AppRequestInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* ShinyProxy
33
*
4-
* Copyright (C) 2016-2025 Open Analytics
4+
* Copyright (C) 2016-2026 Open Analytics
55
*
66
* ===========================================================================
77
*

src/main/java/eu/openanalytics/shinyproxy/AuthenticationRequiredFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* ShinyProxy
33
*
4-
* Copyright (C) 2016-2025 Open Analytics
4+
* Copyright (C) 2016-2026 Open Analytics
55
*
66
* ===========================================================================
77
*

src/main/java/eu/openanalytics/shinyproxy/ShinyProxyConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* ShinyProxy
33
*
4-
* Copyright (C) 2016-2025 Open Analytics
4+
* Copyright (C) 2016-2026 Open Analytics
55
*
66
* ===========================================================================
77
*

src/main/java/eu/openanalytics/shinyproxy/ShinyProxyIframeScriptInjector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* ShinyProxy
33
*
4-
* Copyright (C) 2016-2025 Open Analytics
4+
* Copyright (C) 2016-2026 Open Analytics
55
*
66
* ===========================================================================
77
*

src/main/java/eu/openanalytics/shinyproxy/ShinyProxySpecExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* ShinyProxy
33
*
4-
* Copyright (C) 2016-2025 Open Analytics
4+
* Copyright (C) 2016-2026 Open Analytics
55
*
66
* ===========================================================================
77
*

src/main/java/eu/openanalytics/shinyproxy/ShinyProxySpecExtensionProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* ShinyProxy
33
*
4-
* Copyright (C) 2016-2025 Open Analytics
4+
* Copyright (C) 2016-2026 Open Analytics
55
*
66
* ===========================================================================
77
*

src/main/java/eu/openanalytics/shinyproxy/ShinyProxySpecProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* ShinyProxy
33
*
4-
* Copyright (C) 2016-2025 Open Analytics
4+
* Copyright (C) 2016-2026 Open Analytics
55
*
66
* ===========================================================================
77
*

src/main/java/eu/openanalytics/shinyproxy/ShinyProxyTestStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* ShinyProxy
33
*
4-
* Copyright (C) 2016-2025 Open Analytics
4+
* Copyright (C) 2016-2026 Open Analytics
55
*
66
* ===========================================================================
77
*

src/main/java/eu/openanalytics/shinyproxy/Thymeleaf.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* ShinyProxy
33
*
4-
* Copyright (C) 2016-2025 Open Analytics
4+
* Copyright (C) 2016-2026 Open Analytics
55
*
66
* ===========================================================================
77
*

0 commit comments

Comments
 (0)