Updated for 1.2.2

Red5 · Sep 4, 2019 · 7477a0c · 7477a0c
1 parent 9b8f3f5
commit 7477a0c
Show file tree

Hide file tree

Showing 34 changed files with 2,968 additions and 2,961 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-plugins-parent</artifactId>
@@ -105,13 +105,13 @@
             <dependency>
                 <groupId>org.red5</groupId>
                 <artifactId>red5-server</artifactId>
-                <version>${parent.version}</version>
+                <version>${project.parent.version}</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.red5</groupId>
                 <artifactId>red5-server-common</artifactId>
-                <version>${parent.version}</version>
+                <version>${project.parent.version}</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
@@ -124,13 +124,21 @@
                 <artifactId>slf4j-api</artifactId>
                 <version>${slf4j.version}</version>
             </dependency>
+            <!--
             <dependency>
                 <groupId>org.jboss.spec</groupId>
                 <artifactId>jboss-javaee-6.0</artifactId>
                 <version>3.0.1.Final</version>
                 <type>pom</type>
                 <scope>import</scope>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>*</artifactId>
+                        <groupId>*</groupId>
+                    </exclusion>
+                 </exclusions>
             </dependency>
+            -->
             <dependency>
                 <groupId>org.apache.mina</groupId>
                 <artifactId>mina-parent</artifactId>
@@ -291,46 +299,6 @@
                 <artifactId>spring-security-core</artifactId>
                 <version>${spring-security.version}</version>
             </dependency>
-            <!--
-            <dependency>
-                <groupId>org.apache.geronimo.plugingroups</groupId>
-                <artifactId>javaee6-tomcat</artifactId>
-                <version>3.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-core</artifactId>
-                <version>4.1.6.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-c3p0</artifactId>
-                <version>4.1.6.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>org.javassist</groupId>
-                <artifactId>javassist</artifactId>
-                <version>3.16.1-GA</version>
-            </dependency>
-            <dependency>
-                <groupId>dom4j</groupId>
-                <artifactId>dom4j</artifactId>
-                <version>1.6.1</version>
-            </dependency>
-            <dependency>
-                <groupId>com.h2database</groupId>
-                <artifactId>h2</artifactId>
-                <version>1.3.170</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-                <version>2.5</version>
-                <type>jar</type>
-                <scope>compile</scope>
-            </dependency>
-            -->
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>

diff --git a/tomcat/pom.xml b/tomcat/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-plugins-parent</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>tomcatplugin</artifactId>
     <packaging>jar</packaging>
     <name>tomcatplugin</name>
-    <version>2.0.16</version>
+    <version>2.2.2</version>
     <url>/~https://github.com/Red5/red5-plugins/tree/master/tomcat</url>
     <description>Tomcat web and websocket container plugin</description>
     <properties>
@@ -37,6 +37,19 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
             </plugin>
+            <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-toolchains-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>net.revelc.code.formatter</groupId>
+                <artifactId>formatter-maven-plugin</artifactId>
+            </plugin>
         </plugins>
         <testResources>
             <testResource>
@@ -71,11 +84,6 @@
             <version>${tomcat.version}</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.apache.tomcat/tomcat-websocket -->
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-websocket-api</artifactId>
-            <version>${tomcat.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-websocket</artifactId>
@@ -85,7 +93,7 @@
                     <groupId>org.apache.tomcat</groupId>
                     <artifactId>tomcat-juli</artifactId>
                 </exclusion>
-            </exclusions>
+             </exclusions>
         </dependency>
         <dependency>
             <groupId>junit</groupId>