diff --git a/client/pom.xml b/client/pom.xml index 052cba769cf667066b9ccbe433a47461bf47f4f3..5305335dab8baa4f84085c7649f1e141cd671eb0 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.32</version> + <version>1.3.33</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 354b4744d584ca8cbd312227dee1103f26b1f896..617362a23096a61d287a56b2cad48815593ff45e 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.32"; + public static final String VERSION = "Red5 Client 1.3.33"; /** * 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 594d9aa52c9cb11e74287173a497ad9da3ca020a..745cece8d07d823a7fe3270373a4d4de0d234704 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.32</version> + <version>1.3.33</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>red5-server-common</artifactId> @@ -56,11 +56,6 @@ <artifactId>logback-classic</artifactId> <version>${logback.version}</version> </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - <version>${bc.version}</version> - </dependency> <dependency> <groupId>org.apache.mina</groupId> <artifactId>mina-core</artifactId> @@ -110,7 +105,7 @@ <dependency> <groupId>net.engio</groupId> <artifactId>mbassador</artifactId> - <version>1.3.32</version> + <version>1.3.33</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 592b5b03254b5840f48d2688442c6d918f9edf67..ee940ab8a3e6069e14d39506ddfe982264d7f280 100644 --- a/common/src/main/java/org/red5/server/api/Red5.java +++ b/common/src/main/java/org/red5/server/api/Red5.java @@ -57,12 +57,12 @@ public final class Red5 { /** * Server version with revision */ - public static final String VERSION = "Red5 Server 1.3.32"; + public static final String VERSION = "Red5 Server 1.3.33"; /** * Server version for fmsVer requests */ - public static final String FMS_VERSION = "RED5/1,3,32,0"; + public static final String FMS_VERSION = "RED5/1,3,33,0"; /** * Server capabilities diff --git a/io/pom.xml b/io/pom.xml index 6b7b90800964bdf262ea9213553b207493bf961e..8e7f091d11eb261653dc455bdff02ad1cbd20669 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.32</version> + <version>1.3.33</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>red5-io</artifactId> diff --git a/pom.xml b/pom.xml index dd36af407b1aee9d05bd665bf6da78a5aae19296..b1f6c7ebcb3b46148d04ce4636482c13d19a84e7 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ <name>Red5</name> <description>The Red5 server</description> <groupId>org.red5</groupId> - <version>1.3.32</version> + <version>1.3.33</version> <url>https://github.com/Red5/red5-server</url> <inceptionYear>2005</inceptionYear> <organization> @@ -102,14 +102,13 @@ <red5-service.version>${project.version}</red5-service.version> <slf4j.version>2.0.11</slf4j.version> <logback.version>1.4.14</logback.version> - <bc.version>1.62</bc.version> + <bc.version>1.77</bc.version> <mina.version>2.0.23</mina.version> <!-- Can no longer open-end spring, 6.0 forces jdk 17 --> <spring.version>5.3.33</spring.version> <tomcat.version>8.5.95</tomcat.version> <junit.version>[4.13.1,)</junit.version> <isoparser.version>1.9.59</isoparser.version> - <tika.version>1.28.5</tika.version> <ehcache.version>2.10.6</ehcache.version> <commons-beanutils.version>1.9.4</commons-beanutils.version> <commons-codec.version>1.13</commons-codec.version> @@ -492,6 +491,11 @@ <version>${mina.version}</version> <type>pom</type> </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk18on</artifactId> + <version>${bc.version}</version> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -524,8 +528,7 @@ </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - <version>${bc.version}</version> + <artifactId>bcprov-jdk18on</artifactId> </dependency> <dependency> <groupId>org.springframework</groupId> diff --git a/server/pom.xml b/server/pom.xml index 54ca2368d9845605ee5bd7a4f73971f58a32b7e8..714f6ae73e7f684646b28cb37525165c9c144d3a 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.32</version> + <version>1.3.33</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>red5-server</artifactId> diff --git a/server/src/test/java/org/red5/server/net/rtmp/codec/TestRTMPProtocolDecoder.java b/server/src/test/java/org/red5/server/net/rtmp/codec/TestRTMPProtocolDecoder.java index 0d044bfa2d921cad5427d2ad5292eea3e22f116c..213555443777aca1093d325621274760cbfe47f1 100644 --- a/server/src/test/java/org/red5/server/net/rtmp/codec/TestRTMPProtocolDecoder.java +++ b/server/src/test/java/org/red5/server/net/rtmp/codec/TestRTMPProtocolDecoder.java @@ -253,9 +253,9 @@ public class TestRTMPProtocolDecoder implements IRTMPHandler { @Test public void testNullJsonKV() { log.debug("\n testNullJsonKV"); + @SuppressWarnings("unused") RTMPProtocolEncoder enc = new RTMPProtocolEncoder(); RTMPProtocolDecoder dec = new RTMPProtocolDecoder(); - //RTMPMinaConnection conn = new RTMPMinaConnection(); RTMPMinaConnection conn = new RTMPMinaConnection() { @Override public Encoding getEncoding() { diff --git a/service/pom.xml b/service/pom.xml index 1d3c90f7e034c83331c2c49bdd9ced13a65a5349..6008d9b0a87378e076b71068aa4de31fd5f5877e 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.32</version> + <version>1.3.33</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>red5-service</artifactId> diff --git a/servlet/pom.xml b/servlet/pom.xml index c783d679357f320770270653497356ad902525c6..14e16e119015f7682e5cb465a3d8df5adabbb5c8 100644 --- a/servlet/pom.xml +++ b/servlet/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.red5</groupId> <artifactId>red5-parent</artifactId> - <version>1.3.32</version> + <version>1.3.33</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>red5-servlet</artifactId>