From f76bae108505ef277da5898748dd7f4db428e844 Mon Sep 17 00:00:00 2001 From: Paul Gregoire <mondain@gmail.com> Date: Mon, 21 Nov 2022 13:47:36 -0800 Subject: [PATCH] Updated solely for Spring workaround; versioned 1.3.12 --- client/pom.xml | 2 +- client/src/main/java/org/red5/client/Red5Client.java | 2 +- common/pom.xml | 4 ++-- common/src/main/java/org/red5/server/api/Red5.java | 4 ++-- io/pom.xml | 2 +- pom.xml | 5 +++-- server/pom.xml | 2 +- .../org/red5/net/websocket/server/WsHttpUpgradeHandler.java | 2 -- service/pom.xml | 2 +- 9 files changed, 12 insertions(+), 13 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 3c27bd29..780e4c3d 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.red5</groupId> <artifactId>red5-parent</artifactId> - <version>1.3.11</version> + <version>1.3.12</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>red5-client</artifactId> diff --git a/client/src/main/java/org/red5/client/Red5Client.java b/client/src/main/java/org/red5/client/Red5Client.java index 29b84584..db0245dd 100644 --- a/client/src/main/java/org/red5/client/Red5Client.java +++ b/client/src/main/java/org/red5/client/Red5Client.java @@ -18,7 +18,7 @@ public final class Red5Client { /** * Current server version with revision */ - public static final String VERSION = "Red5 Client 1.3.11"; + public static final String VERSION = "Red5 Client 1.3.12"; /** * Create a new Red5Client object using the connection local to the current thread A bit of magic that lets you access the red5 scope diff --git a/common/pom.xml b/common/pom.xml index 82d6c5ac..6a626111 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.red5</groupId> <artifactId>red5-parent</artifactId> - <version>1.3.11</version> + <version>1.3.12</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>red5-server-common</artifactId> @@ -124,7 +124,7 @@ <dependency> <groupId>net.engio</groupId> <artifactId>mbassador</artifactId> - <version>1.3.11</version> + <version>1.3.12</version> </dependency> --> <dependency> <groupId>junit</groupId> diff --git a/common/src/main/java/org/red5/server/api/Red5.java b/common/src/main/java/org/red5/server/api/Red5.java index 713690f5..b63f8daf 100644 --- a/common/src/main/java/org/red5/server/api/Red5.java +++ b/common/src/main/java/org/red5/server/api/Red5.java @@ -55,12 +55,12 @@ public final class Red5 { /** * Server version with revision */ - public static final String VERSION = "Red5 Server 1.3.11"; + public static final String VERSION = "Red5 Server 1.3.12"; /** * Server version for fmsVer requests */ - public static final String FMS_VERSION = "RED5/1,3,11,0"; + public static final String FMS_VERSION = "RED5/1,3,12,0"; /** * Server capabilities diff --git a/io/pom.xml b/io/pom.xml index 29c6776a..0edd3d24 100644 --- a/io/pom.xml +++ b/io/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.red5</groupId> <artifactId>red5-parent</artifactId> - <version>1.3.11</version> + <version>1.3.12</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>red5-io</artifactId> diff --git a/pom.xml b/pom.xml index db7c8620..16ffb494 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <name>Red5</name> <description>The Red5 server</description> <groupId>org.red5</groupId> - <version>1.3.11</version> + <version>1.3.12</version> <url>https://github.com/Red5/red5-server</url> <inceptionYear>2005</inceptionYear> <organization> @@ -99,7 +99,8 @@ <logback.version>1.2.11</logback.version> <bc.version>1.62</bc.version> <mina.version>2.0.23</mina.version> - <spring.version>[5.3.5,)</spring.version> + <!-- Can no longer open-end spring, 6.0 forces jdk 17 --> + <spring.version>5.3.24</spring.version> <tomcat.version>8.5.83</tomcat.version> <junit.version>[4.13.1,)</junit.version> <isoparser.version>1.9.39</isoparser.version> diff --git a/server/pom.xml b/server/pom.xml index e9d5fdc5..bf73006d 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.red5</groupId> <artifactId>red5-parent</artifactId> - <version>1.3.11</version> + <version>1.3.12</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>red5-server</artifactId> diff --git a/server/src/main/java/org/red5/net/websocket/server/WsHttpUpgradeHandler.java b/server/src/main/java/org/red5/net/websocket/server/WsHttpUpgradeHandler.java index 8ee85aa5..5292714b 100644 --- a/server/src/main/java/org/red5/net/websocket/server/WsHttpUpgradeHandler.java +++ b/server/src/main/java/org/red5/net/websocket/server/WsHttpUpgradeHandler.java @@ -4,8 +4,6 @@ import java.io.IOException; import java.util.List; import java.util.Map; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpSession; import javax.servlet.http.WebConnection; import javax.websocket.CloseReason; diff --git a/service/pom.xml b/service/pom.xml index 139168ed..d3ccbbdc 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.red5</groupId> <artifactId>red5-parent</artifactId> - <version>1.3.11</version> + <version>1.3.12</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>red5-service</artifactId> -- GitLab