Updates for new jdk11 builds

Red5 · Jan 7, 2021 · 2c0376a · 2c0376a
1 parent cbb940b
commit 2c0376a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 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.3</version>
+        <version>1.2.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-plugins-parent</artifactId>

diff --git a/tomcat/pom.xml b/tomcat/pom.xml
@@ -4,20 +4,22 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-plugins-parent</artifactId>
-        <version>1.2.3</version>
+        <version>1.2.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>tomcatplugin</artifactId>
     <packaging>jar</packaging>
     <name>tomcatplugin</name>
-    <version>2.2.6</version>
+    <version>2.2.8</version>
     <url>https://github.com/Red5/red5-plugins/tree/master/tomcat</url>
     <description>Tomcat web and websocket container plugin</description>
     <properties>
         <!-- Next 3 entries for JDK 8 only; remove for JDK 11 -->
+        <!--
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <java.release.level>8</java.release.level>
+    -->
         <tyrus.version>1.15</tyrus.version>
         <!-- Local to plugin version of tomcat https://tomcat.apache.org/download-80.cgi -->
         <tomcat-local.version>8.5.61</tomcat-local.version>
@@ -30,12 +32,16 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version><!--$NO-MVN-MAN-VER$-->
                 <configuration>
+                    <!--
                     <source>1.8</source>
                     <target>1.8</target>
+                -->
                     <verbose>true</verbose>
                     <fork>true</fork>
                     <executable>/usr/lib/jvm/java-11-amazon-corretto/bin/javac</executable>
+                    <!--
                     <compilerVersion>1.8</compilerVersion>
+                -->
                 </configuration>
             </plugin>
             <plugin>
@@ -51,7 +57,7 @@
                 <configuration>
                     <toolchains>
                         <jdk>
-                            <version>[1.8,)</version>
+                            <version>[1.11,)</version>
                         </jdk>
                     </toolchains>
                 </configuration>