Skip to content

Commit 0db9345

Browse files
committed
Update mvn plugin versions. Add support for gstreamer rtmp2src
1 parent 753198d commit 0db9345

File tree

10 files changed

+38
-16
lines changed

10 files changed

+38
-16
lines changed

client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.red5</groupId>
55
<artifactId>red5-parent</artifactId>
6-
<version>2.0.20</version>
6+
<version>2.0.21</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>red5-client</artifactId>

client/src/main/java/org/red5/client/Red5Client.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public final class Red5Client {
1818
/**
1919
* Current server version with revision
2020
*/
21-
public static final String VERSION = "Red5 Client 2.0.20";
21+
public static final String VERSION = "Red5 Client 2.0.21";
2222

2323
/**
2424
* Create a new Red5Client object using the connection local to the current thread A bit of magic that lets you access the red5 scope

common/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.red5</groupId>
55
<artifactId>red5-parent</artifactId>
6-
<version>2.0.20</version>
6+
<version>2.0.21</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>red5-server-common</artifactId>
@@ -88,7 +88,7 @@
8888
<dependency>
8989
<groupId>net.engio</groupId>
9090
<artifactId>mbassador</artifactId>
91-
<version>2.0.20</version>
91+
<version>2.0.21</version>
9292
</dependency> -->
9393
</dependencies>
9494
</project>

common/src/main/java/org/red5/server/api/Red5.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ public final class Red5 {
5757
/**
5858
* Server version with revision
5959
*/
60-
public static final String VERSION = "Red5 Server 2.0.20";
60+
public static final String VERSION = "Red5 Server 2.0.21";
6161

6262
/**
6363
* Server version for fmsVer requests
6464
*/
65-
public static final String FMS_VERSION = "RED5/2,0,20,0";
65+
public static final String FMS_VERSION = "RED5/2,0,21,0";
6666

6767
/**
6868
* Server capabilities

common/src/main/java/org/red5/server/stream/PlayEngine.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
import org.red5.server.stream.message.ResetMessage;
7070
import org.red5.server.stream.message.StatusMessage;
7171
import org.slf4j.Logger;
72+
import org.slf4j.LoggerFactory;
7273

7374
/**
7475
* A play engine for playing a IPlayItem.
@@ -79,10 +80,11 @@
7980
* @author Dan Rossi
8081
* @author Tiago Daniel Jacobs ([email protected])
8182
* @author Vladimir Hmelyoff ([email protected])
83+
* @author Andy Shaules
8284
*/
8385
public final class PlayEngine implements IFilter, IPushableConsumer, IPipeConnectionListener {
8486

85-
private static final Logger log = Red5LoggerFactory.getLogger(PlayEngine.class);
87+
private static final Logger log = LoggerFactory.getLogger(PlayEngine.class);
8688

8789
private static boolean isDebug = log.isDebugEnabled();
8890

@@ -395,6 +397,13 @@ public void play(IPlayItem item, boolean withReset) throws StreamNotFoundExcepti
395397
playDecision = 2;
396398
}
397399
break;
400+
case 0://Gstreamer rtmp2src compatibility.
401+
if (sourceType == IProviderService.INPUT_TYPE.LIVE) {
402+
playDecision = 0;
403+
} else if (sourceType == IProviderService.INPUT_TYPE.VOD) {
404+
playDecision = 1;
405+
}
406+
break;
398407
default:
399408
if (sourceType == IProviderService.INPUT_TYPE.VOD) {
400409
playDecision = 1;

io/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.red5</groupId>
55
<artifactId>red5-parent</artifactId>
6-
<version>2.0.20</version>
6+
<version>2.0.21</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>red5-io</artifactId>

pom.xml

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<name>Red5</name>
2525
<description>The Red5 server</description>
2626
<groupId>org.red5</groupId>
27-
<version>2.0.20</version>
27+
<version>2.0.21</version>
2828
<url>https://github.com/Red5/red5-server</url>
2929
<inceptionYear>2005</inceptionYear>
3030
<organization>
@@ -240,7 +240,7 @@
240240
</plugin>
241241
<plugin>
242242
<artifactId>maven-dependency-plugin</artifactId>
243-
<version>3.6.1</version>
243+
<version>3.8.1</version>
244244
<executions>
245245
<execution>
246246
<id>copy-dependencies</id>
@@ -268,12 +268,12 @@
268268
<plugin>
269269
<groupId>org.apache.felix</groupId>
270270
<artifactId>maven-bundle-plugin</artifactId>
271-
<version>4.2.0</version>
271+
<version>6.0.0</version>
272272
<extensions>true</extensions>
273273
</plugin>
274274
<plugin>
275275
<artifactId>maven-release-plugin</artifactId>
276-
<version>2.5.3</version>
276+
<version>3.1.1</version>
277277
<configuration>
278278
<autoVersionSubmodules>true</autoVersionSubmodules>
279279
<useReleaseProfile>false</useReleaseProfile>
@@ -320,7 +320,7 @@
320320
<plugins>
321321
<plugin>
322322
<artifactId>maven-javadoc-plugin</artifactId>
323-
<version>3.11.2</version>
323+
<version>3.11.3</version>
324324
<configuration>
325325
<verbose>${verbose}</verbose>
326326
<release>${java.release.level}</release>
@@ -346,6 +346,7 @@
346346
<head>To do:</head>
347347
</tag>
348348
</tags>
349+
<excludePackageNames>org.apache.*</excludePackageNames>
349350
</configuration>
350351
<reportSets>
351352
<reportSet>
@@ -555,6 +556,17 @@
555556
<id>release</id>
556557
<build>
557558
<plugins>
559+
<plugin>
560+
<groupId>org.sonatype.central</groupId>
561+
<artifactId>central-publishing-maven-plugin</artifactId>
562+
<version>0.8.0</version>
563+
<extensions>true</extensions>
564+
<configuration>
565+
<publishingServerId>ossrh</publishingServerId>
566+
<autoPublish>true</autoPublish>
567+
</configuration>
568+
</plugin>
569+
<!--
558570
<plugin>
559571
<groupId>org.sonatype.plugins</groupId>
560572
<artifactId>nexus-staging-maven-plugin</artifactId>
@@ -579,6 +591,7 @@
579591
</execution>
580592
</executions>
581593
</plugin>
594+
-->
582595
</plugins>
583596
</build>
584597
<distributionManagement>

server/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.red5</groupId>
55
<artifactId>red5-parent</artifactId>
6-
<version>2.0.20</version>
6+
<version>2.0.21</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>red5-server</artifactId>

service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.red5</groupId>
55
<artifactId>red5-parent</artifactId>
6-
<version>2.0.20</version>
6+
<version>2.0.21</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>red5-service</artifactId>

servlet/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.red5</groupId>
55
<artifactId>red5-parent</artifactId>
6-
<version>2.0.20</version>
6+
<version>2.0.21</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>red5-servlet</artifactId>

0 commit comments

Comments
 (0)