Merge branch '2.x'

pom.xml

@@ -11,7 +11,7 @@
 		<commons-lang-version>2.6</commons-lang-version>
 		<guava-version>20.0</guava-version>
 		<directory-server-version>1.5.5</directory-server-version>
-		<io.netty-version>4.1.30.Final</io.netty-version>
+		<io.netty-version>4.1.32.Final</io.netty-version>
 		<org.aspectj-version>1.8.13</org.aspectj-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<timestamp>${maven.build.timestamp}</timestamp>
@@ -336,7 +336,7 @@
 		<dependency>
 			<groupId>org.checkerframework</groupId>
 			<artifactId>checker-qual</artifactId>
-			<version>2.5.6</version>
+			<version>2.5.8</version>
 		</dependency>
 	</dependencies>
 
@@ -412,7 +412,7 @@
 			<plugin>
 				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-maven-plugin</artifactId>
-				<version>9.4.12.v20180830</version>
+				<version>9.4.14.v20181114</version>
 				<configuration>
 					<scanIntervalSeconds>0</scanIntervalSeconds>
 					<webApp>
@@ -532,7 +532,7 @@
 			<plugin>
 				<groupId>pl.project13.maven</groupId>
 				<artifactId>git-commit-id-plugin</artifactId>
-				<version>2.2.5</version>
+				<version>2.2.6</version>
 				<executions>
 					<execution>
 						<goals>