Update dependencies

Author: graemerocher

gradle.properties

@@ -39,7 +39,7 @@ micronautSpringVersion=1.0.2
 micronautGcpVersion=1.1.0
 micronautAwsVersion=1.3.5
 micronautCacheVersion=1.0.0.M1
-micronautGrpcVersion=1.1.0
+micronautGrpcVersion=1.1.1
 micronautOpenApi=1.3.1
 micronautRedisVersion=1.2.0
 micronautMongoVersion=1.2.0
@@ -115,7 +115,7 @@ tomcatJdbcVersion=9.0.21
 liquibaseVersion=3.6.3
 flywayVersion=5.2.4
 jcacheVersion=1.1.0
-hibernateVersion=5.4.9.Final
+hibernateVersion=5.4.10.Final
 methvinDirectoryWatcherVersion=0.9.6
 jnaVersion=5.3.1
 elasticsearchVersion=6.4.0

src/main/docs/guide/introduction/whatsNew.adoc

@@ -100,37 +100,18 @@ Optional Third Party Dependencies:
 * Jaeger `0.35.5` -> `1.0.0`
 * Spring `5.1.8` -> `5.2.1`
 * Zipkin/Brave `5.6.5` -> `5.9.0`
+* Groovy `2.5.7` -> `2.5.8`
+* Gradle `5.5` -> `Gradle 6.0.1` (for new applications)
+* Hibernate Core `5.4.6.Final` -> `5.4.10.Final`
 
 Modules:
 
-<<<<<<< HEAD
-* Micronaut GRPC `1.0.1` -> `1.1.0`
+* Micronaut GRPC `1.0.1` -> `1.1.1`
 * Micronaut Micrometer `1.2.1` -> `1.3.0`
 * Micronaut MongoDB `1.1.0` -> `1.2.0`
 * Micronaut Neo4j `1.1.0` -> `1.2.0`
 * Micronaut OpenAPI `1.2.0` -> `1.3.0`
 * Micronaut Redis `1.1.0` -> `1.2.0`
 * Micronaut SQL `1.2.3` -> `1.3.0`
 * Micronaut Views `1.2.0` -> `1.3.0`
-=======
-- Groovy `2.5.4` -> `2.5.6`
-- Gradle `5.1.1` -> `Gradle 5.5` (for new applications)
-- Micronaut SQL `1.1.1` -> `1.2.0`
-- Micronaut Micrometer `1.1.0` -> `1.2.0`
-- Micrometer `1.1.5` -> `1.2.0`
-- Micronaut Security `1.1.1` -> `1.2.0`
-- Micronaut Views `1.1.3` -> `1.2.0`
-- Micronaut Test `1.0.4` -> `1.1.0`
-- Netty `4.1.30.Final` -> `4.1.43.Final`
-- Neo4j Driver `1.7.2` -> `1.7.5`
-- Mongo Driver `3.8.0` -> `3.10.1`
-- Mongo Reactive Streams `1.10.0` -> `1.11.0`
-- Kafka `2.1.1` -> `2.3.0`
-- Snake YAML `1.23` -> `1.24`
-- Lettuce `5.1.3.RELEASE` -> `5.1.7.RELEASE`
-- JUnit `5.3.2` -> `5.5.0`
-- Picocli `3.5.2` -> `4.0.1`
-- Jaeger `0.33.1` -> `0.35.5`
-- Zipkin Reporter `2.8.4` -> `2.10.0`
-- Open Tracing `0.31.0` -> `0.33.0`
->>>>>>> 1.2.x
+