Commit Graph

487 Commits (2f7b089a14cf83fedcc46171b82c8641e663aca7)

Author SHA1 Message Date
Nikita Koksharov 20dd4ad428 [maven-release-plugin] prepare release redisson-2.14.0
Nikita 033829134c Merge branch 'master' into 3.0.0
# Conflicts:
#	redisson/pom.xml
Nikita 9c69d25caf plugins updated
Nikita f925b484dc [maven-release-plugin] prepare for next development iteration
Nikita 6e46a51bd1 [maven-release-plugin] prepare release redisson-3.8.2
Nikita 48197a918c [maven-release-plugin] prepare for next development iteration
Nikita d09e06cc7e [maven-release-plugin] prepare release redisson-2.13.2
Nikita 72757710cc Merge branch 'master' into 3.0.0
# Conflicts:
#	redisson/src/main/java/org/redisson/reactive/RedissonSetCacheReactive.java
Nikita d77f5ccbd3 netty updated
Nikita 9dcc834275 [maven-release-plugin] prepare for next development iteration
Nikita 20f7370dff [maven-release-plugin] prepare release redisson-3.8.1
Nikita 2b08f0bb92 [maven-release-plugin] prepare for next development iteration
Nikita 6447a3af9f [maven-release-plugin] prepare release redisson-2.13.1
Nikita 1b71bd5833 Fixed build under JDK10
Nikita 5bb7e17e97 Merge branch 'master' into 3.0.0
# Conflicts:
#	pom.xml
#	redisson-all/pom.xml
#	redisson-spring-boot-starter/pom.xml
#	redisson-spring-data/pom.xml
#	redisson-spring-data/redisson-spring-data-16/pom.xml
#	redisson-spring-data/redisson-spring-data-17/pom.xml
#	redisson-spring-data/redisson-spring-data-18/pom.xml
#	redisson-spring-data/redisson-spring-data-20/pom.xml
#	redisson-tomcat/pom.xml
#	redisson-tomcat/redisson-tomcat-6/pom.xml
#	redisson-tomcat/redisson-tomcat-7/pom.xml
#	redisson-tomcat/redisson-tomcat-8/pom.xml
#	redisson-tomcat/redisson-tomcat-9/pom.xml
#	redisson/pom.xml
#	redisson/src/main/java/org/redisson/RedissonLongAdder.java
Nikita f529d30e5d Fixed compilation using JDK 10
Nikita f65b54404a [maven-release-plugin] prepare for next development iteration
Nikita 3a28b43bcf [maven-release-plugin] prepare release redisson-2.13.0
Nikita 98c601fc1d version fixed
Nikita ca47b2baeb poms fixed
Nikita e24ffbc7e8 [maven-release-plugin] prepare for next development iteration
Nikita 993bbb4a11 [maven-release-plugin] prepare release redisson-3.8.0
Nikita 60d89c4d96 version fixed
Nikita 25e16e2f54 [maven-release-plugin] prepare for next development iteration
Nikita 947b1b38aa [maven-release-plugin] prepare release redisson-3.8.0
Nikita 480b08c880 version updated
Nikita 009dadf29e [maven-release-plugin] prepare for next development iteration
Nikita e47d50af2c [maven-release-plugin] prepare release redisson-3.8
Nikita e9f271d2d0 pom fixed
Nikita 787246b0b5 [maven-release-plugin] prepare for next development iteration
Nikita 951d22640b [maven-release-plugin] prepare release redisson-2.13
Nikita ffc1f08e74 Merge branch 'master' into 3.0.0
Nikita 618505befa poms updated
Nikita d5b68f4289 Merge branch 'master' into 3.0.0
Nikita 99a36009ff redisson-spring-boot-starter module added.
Nikita cdd7c8ae2f netty updated
Nikita b1d31e05a4 Merge branch 'master' into 3.0.0
# Conflicts:
#	pom.xml
#	redisson-all/pom.xml
#	redisson-tomcat/pom.xml
#	redisson-tomcat/redisson-tomcat-6/pom.xml
#	redisson-tomcat/redisson-tomcat-7/pom.xml
#	redisson-tomcat/redisson-tomcat-8/pom.xml
#	redisson-tomcat/redisson-tomcat-9/pom.xml
#	redisson/pom.xml
#	redisson/src/main/java/org/redisson/reactive/RedissonListMultimapReactive.java
#	redisson/src/main/java/org/redisson/reactive/RedissonSetMultimapReactive.java
#	redisson/src/main/java/org/redisson/spring/session/RedissonSessionRepository.java
Nikita 43765f94de Spring Data module added.
Nikita b7c102caad netty updated
Nikita eb3462ed75 [maven-release-plugin] prepare for next development iteration
Nikita b4680300fb [maven-release-plugin] prepare release redisson-3.7.5
Nikita 4b828a6cb6 [maven-release-plugin] prepare for next development iteration
Nikita c1968b1cba [maven-release-plugin] prepare release redisson-2.12.5
Nikita a0f559f62e [maven-release-plugin] prepare for next development iteration
Nikita 5b1728161b [maven-release-plugin] prepare release redisson-3.7.4
Nikita 879109b9da [maven-release-plugin] prepare for next development iteration
Nikita a44477f50a [maven-release-plugin] prepare release redisson-2.12.4
Nikita 1695d1aa56 Merge branch 'master' into 3.0.0
Nikita 581885c4de netty updated
Nikita d37aa9b442 [maven-release-plugin] prepare for next development iteration
Nikita 45f9b4b831 [maven-release-plugin] prepare release redisson-3.7.3
Nikita 1a61d03655 [maven-release-plugin] prepare for next development iteration
Nikita b506c2e41d [maven-release-plugin] prepare release redisson-2.12.3
Nikita 6eddcfb876 [maven-release-plugin] prepare for next development iteration
Nikita 9a314e1106 [maven-release-plugin] prepare release redisson-3.7.2
Nikita d295f4ab44 [maven-release-plugin] prepare for next development iteration
Nikita 5e89e554ab [maven-release-plugin] prepare release redisson-2.12.2
Nikita d1519c350b [maven-release-plugin] prepare for next development iteration
Nikita 77b69063eb [maven-release-plugin] prepare release redisson-3.7.1
Nikita ba14300611 [maven-release-plugin] prepare for next development iteration
Nikita a8624c55d0 [maven-release-plugin] prepare release redisson-2.12.1
Nikita 6dc933d47b Merge branch 'master' into 3.0.0
# Conflicts:
#	pom.xml
#	redisson-all/pom.xml
#	redisson-tomcat/pom.xml
#	redisson-tomcat/redisson-tomcat-6/pom.xml
#	redisson-tomcat/redisson-tomcat-7/pom.xml
#	redisson-tomcat/redisson-tomcat-8/pom.xml
#	redisson-tomcat/redisson-tomcat-9/pom.xml
#	redisson/pom.xml
Nikita f173e00020 netty updated
Nikita f6cb32655f [maven-release-plugin] prepare for next development iteration
Nikita 12b326873b [maven-release-plugin] prepare release redisson-3.7.0
Nikita 59ee2a2738 [maven-release-plugin] prepare for next development iteration
Nikita f817b8aed9 [maven-release-plugin] prepare release redisson-2.12.0
Nikita 204f482d43 Merge branch 'master' into 3.0.0
Nikita 49b26f5545 netty updated.
Nikita 09c5a6baf3 Merge branch 'master' into 3.0.0
# Conflicts:
#	pom.xml
#	redisson-all/pom.xml
#	redisson-tomcat/pom.xml
#	redisson-tomcat/redisson-tomcat-6/pom.xml
#	redisson-tomcat/redisson-tomcat-7/pom.xml
#	redisson-tomcat/redisson-tomcat-8/pom.xml
#	redisson-tomcat/redisson-tomcat-9/pom.xml
#	redisson/pom.xml
#	redisson/src/main/java/org/redisson/RedissonReactive.java
#	redisson/src/main/java/org/redisson/command/CommandReactiveBatchService.java
#	redisson/src/main/java/org/redisson/reactive/RedissonBatchReactive.java
#	redisson/src/test/java/org/redisson/RedissonMapTest.java
Nikita ba43ae3f46 [maven-release-plugin] prepare for next development iteration
Nikita 068217da78 [maven-release-plugin] prepare release redisson-3.6.5
Nikita fad11d51e2 [maven-release-plugin] prepare for next development iteration
Nikita 7e0227eb46 [maven-release-plugin] prepare release redisson-2.11.5
Nikita 935d7dddaf netty updated
Nikita 0a4f30d540 [maven-release-plugin] prepare for next development iteration
Nikita c4c38de419 [maven-release-plugin] prepare release redisson-3.6.4
Nikita d9e57be29e [maven-release-plugin] prepare for next development iteration
Nikita 8a0d083fd9 [maven-release-plugin] prepare release redisson-2.11.4
Nikita 6fd68c41f8 [maven-release-plugin] prepare for next development iteration
Nikita bfc56a94f8 [maven-release-plugin] prepare release redisson-3.6.3
Nikita 8b52b76e2b [maven-release-plugin] prepare for next development iteration
Nikita d4f75e511e [maven-release-plugin] prepare release redisson-2.11.3
Nikita 587d39d536 Merge branch 'master' into 3.0.0
# Conflicts:
#	pom.xml
#	redisson-all/pom.xml
#	redisson-tomcat/pom.xml
#	redisson-tomcat/redisson-tomcat-6/pom.xml
#	redisson-tomcat/redisson-tomcat-7/pom.xml
#	redisson-tomcat/redisson-tomcat-8/pom.xml
#	redisson-tomcat/redisson-tomcat-9/pom.xml
#	redisson/pom.xml
Nikita eca2583143 netty updated
Nikita 3869ba16c7 [maven-release-plugin] prepare for next development iteration
Nikita 0520d7ac2c [maven-release-plugin] prepare release redisson-3.6.2
Nikita 853f5260fb [maven-release-plugin] prepare for next development iteration
Nikita 2a736e8f6d [maven-release-plugin] prepare release redisson-2.11.2
Nikita 970d1c73dd [maven-release-plugin] prepare for next development iteration
Nikita bf2c43dd19 [maven-release-plugin] prepare release redisson-3.6.1
Nikita 7d6f768849 [maven-release-plugin] prepare for next development iteration
Nikita 7868b30ad2 [maven-release-plugin] prepare release redisson-2.11.1
Nikita cabdec982d Merge branch 'master' into 3.0.0
Johno Crawford 354389f732
Netty 4.1.21 + BOM import.
Nikita b97f5cc8a4 [maven-release-plugin] prepare for next development iteration
Nikita 3db173e5de [maven-release-plugin] prepare release redisson-3.6.0
Nikita 7abc90676c [maven-release-plugin] prepare for next development iteration
Nikita 7dcab544ae [maven-release-plugin] prepare release redisson-2.11.0
Nikita f47de9b9ba [maven-release-plugin] prepare for next development iteration