From 7e1513b06b9a6f6d8cf8c89940398f7eacea253b Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Mon, 7 Jun 2021 09:53:20 +0300
Subject: [PATCH] project building compatibility with jdk 11

---
 pom.xml              | 116 ++++++++++++++++++++-----------------------
 redisson-all/pom.xml |   5 --
 redisson/pom.xml     |   6 ---
 3 files changed, 53 insertions(+), 74 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4f1e03bec..a27a50dca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     <properties>
         <maven.test.skip>true</maven.test.skip>
         <source.version>1.8</source.version>
-        <test.source.version>1.8</test.source.version>
+        <javadoc.version>8</javadoc.version>
         <release.version>8</release.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
@@ -149,7 +149,56 @@
       <testOutputDirectory>${basedir}/target/test-classes</testOutputDirectory>
       <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
       <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
+      
+      <plugins>
+          <plugin>
+         	<groupId>org.sonatype.plugins</groupId>
+         	<artifactId>nexus-staging-maven-plugin</artifactId>
+         	<version>1.6.8</version>
+         	<extensions>true</extensions>
+                <configuration>
+                    <serverId>ossrepo</serverId>
+                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                    <stagingProgressTimeoutMinutes>15</stagingProgressTimeoutMinutes>
+ 		</configuration>
+          </plugin>
+
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-release-plugin</artifactId>
+            <version>2.5.3</version>
+            <configuration>
+                <autoVersionSubmodules>true</autoVersionSubmodules>
+                <useReleaseProfile>true</useReleaseProfile>
+                <releaseProfiles>release</releaseProfiles>
+                <goals>deploy</goals>
+            </configuration>
+          </plugin>
+
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-enforcer-plugin</artifactId>
+              <version>3.0.0-M3</version>
+              <executions>
+                  <execution>
+                      <id>enforce-maven</id>
+                      <goals>
+                          <goal>enforce</goal>
+                      </goals>
+                      <configuration>
+                          <rules>
+                              <requireMavenVersion>
+                                  <version>3.0.5</version>
+                              </requireMavenVersion>
+                          </rules>
+                      </configuration>
+                  </execution>
+              </executions>
+          </plugin>
+      </plugins>
 
+      <pluginManagement>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -168,19 +217,6 @@
                 </configuration>
             </plugin>
 
-       	<plugin>
-       		<groupId>org.sonatype.plugins</groupId>
-       		<artifactId>nexus-staging-maven-plugin</artifactId>
-       		<version>1.6.8</version>
-       		<extensions>true</extensions>
-       		<configuration>
-       			<serverId>ossrepo</serverId>
-       			<nexusUrl>https://oss.sonatype.org/</nexusUrl>
-       			<autoReleaseAfterClose>true</autoReleaseAfterClose>
-                <stagingProgressTimeoutMinutes>15</stagingProgressTimeoutMinutes>
-       		</configuration>
-       	</plugin>
-
 <!--
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
@@ -226,50 +262,22 @@
             </plugin>
 -->
 
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-release-plugin</artifactId>
-            <version>2.5.3</version>
-   		<configuration>
-   			<autoVersionSubmodules>true</autoVersionSubmodules>
-   			<useReleaseProfile>true</useReleaseProfile>
-   			<releaseProfiles>release</releaseProfiles>
-   			<goals>deploy</goals>
-   		</configuration>
-            </plugin>
-
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
                     <source>${source.version}</source>
                     <target>${source.version}</target>
-<!--
                     <release>${release.version}</release>
--->
                     <optimize>true</optimize>
                     <showDeprecation>true</showDeprecation>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>default-testCompile</id>
-                        <phase>process-test-sources</phase>
-                        <goals>
-                            <goal>testCompile</goal>
-                        </goals>
-                        <configuration>
-                            <fork>true</fork>
-                            <source>${test.source.version}</source>
-                            <target>${test.source.version}</target>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
 
             <plugin>
          	<groupId>org.apache.maven.plugins</groupId>
          	<artifactId>maven-javadoc-plugin</artifactId>
-         	<version>3.2.0</version>
+         	<version>3.3.0</version>
          	<executions>
                    <execution>
                      <id>attach-javadocs</id>
@@ -279,33 +287,15 @@
                    </execution>
          	</executions>
                 <configuration>
+                    <source>${javadoc.version}</source>
                     <level>public</level>
                     <doclint>none</doclint>
                     <quiet>true</quiet>
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0-M3</version>
-                <executions>
-                    <execution>
-                        <id>enforce-maven</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireMavenVersion>
-                                    <version>3.0.5</version>
-                                </requireMavenVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
+      </pluginManagement>
   </build>
 
 </project>
diff --git a/redisson-all/pom.xml b/redisson-all/pom.xml
index 173894360..a9a9bd72b 100644
--- a/redisson-all/pom.xml
+++ b/redisson-all/pom.xml
@@ -88,11 +88,6 @@
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-kqueue</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.marshalling</groupId>
-            <artifactId>jboss-marshalling-river</artifactId>
-            <version>2.0.9.Final</version>
-        </dependency>
         <dependency>
             <groupId>org.xerial.snappy</groupId>
             <artifactId>snappy-java</artifactId>
diff --git a/redisson/pom.xml b/redisson/pom.xml
index f8643bccc..5a34f9e1f 100644
--- a/redisson/pom.xml
+++ b/redisson/pom.xml
@@ -371,12 +371,6 @@
          	<artifactId>maven-javadoc-plugin</artifactId>
             </plugin>
 
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>versions-maven-plugin</artifactId>
-                <version>2.7</version>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>