upgrade thrift to avoid security vulnerabilities

rpcx-ecosystem · Mar 27, 2019 · 1e228ff · 1e228ff
1 parent ab8f136
commit 1e228ff
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/thrift/dependency-reduced-pom.xml b/thrift/dependency-reduced-pom.xml
@@ -61,9 +61,9 @@
   </dependencies>
   <properties>
     <skip_maven_deploy>true</skip_maven_deploy>
+    <maven.compiler.target>1.8</maven.compiler.target>
     <java.version>1.8</java.version>
     <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 </project>
 
diff --git a/thrift/pom.xml b/thrift/pom.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" 
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.colobu</groupId>
@@ -14,6 +13,12 @@
         <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
     <dependencies>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-math3</artifactId>
@@ -28,7 +33,7 @@
         <dependency>
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
-            <version>0.11.0</version>
+            <version>[0.12.0,)</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

diff --git a/thrift/src/main/java/com/colobu/thrift/AppServer.java b/thrift/src/main/java/com/colobu/thrift/AppServer.java
@@ -20,7 +20,7 @@ public static void main( String[] args )
         if (args.length >0) {
             delay = Long.parseLong(args[0]);
         }
-        try {
+        try { 
             handler = new GreeterHandler(delay);
             processor = new Greeter.Processor(handler);