#2612 remove thirdparty google guava module

pinpoint-apm · Feb 14, 2017 · d7643a3 · d7643a3
1 parent 400bc29
commit d7643a3
Show file tree

Hide file tree

Showing 490 changed files with 5 additions and 136,213 deletions.
diff --git a/filefilter.txt b/filefilter.txt
@@ -7,5 +7,4 @@
 - \com\navercorp\pinpoint\common\util\apache
 - \com\navercorp\pinpoint\common\util\jsr166
 - \com\navercorp\pinpoint\profiler\util\jdk
-- \com\navercorp\pinpoint\bootstrap\util\spring
-- \com\google
+- \com\navercorp\pinpoint\bootstrap\util\spring
diff --git a/findbugs-exclude.xml b/findbugs-exclude.xml
@@ -2,8 +2,4 @@
     <Match>
         <Package name="~com\.navercorp\.pinpoint\.thrift\.dto.*" />
     </Match>
-    <Match>
-        <!-- google guava -->
-        <Package name="~com\.google.*" />
-    </Match>
 </FindBugsFilter>
diff --git a/pom.xml b/pom.xml
@@ -66,7 +66,6 @@
         <module>test</module>
         <module>web</module>
         <module>hbase</module>
-        <module>thirdparty</module>
     </modules>
 
     <properties>
@@ -119,11 +118,6 @@
                 <artifactId>pinpoint-commons</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.navercorp.pinpoint</groupId>
-                <artifactId>pinpoint-google-guava</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.navercorp.pinpoint</groupId>
                 <artifactId>pinpoint-commons-server</artifactId>
@@ -829,9 +823,6 @@
                         <exclude>com/navercorp/pinpoint/common/util/apache/**/*.java</exclude>
                         <exclude>com/navercorp/pinpoint/common/util/jsr166/**/*.java</exclude>
                         <exclude>com/navercorp/pinpoint/profiler/util/jdk/**/*.java</exclude>
-
-                        <!--google guava-->
-                        <exclude>com/google/**/*.java</exclude>
                     </excludes>
                 </configuration>
             </plugin>
@@ -898,9 +889,6 @@
                         <exclude>com/navercorp/pinpoint/common/util/apache/**/*.java</exclude>
                         <exclude>com/navercorp/pinpoint/common/util/jsr166/**/*.java</exclude>
                         <exclude>com/navercorp/pinpoint/profiler/util/jdk/**/*.java</exclude>
-
-                        <!--google guava-->
-                        <exclude>com/google/**/*.java</exclude>
                     </excludes>
                 </configuration>
             </plugin>
@@ -990,9 +978,6 @@
                         <exclude>com/navercorp/pinpoint/common/util/apache/**/*.java</exclude>
                         <exclude>com/navercorp/pinpoint/common/util/jsr166/**/*.java</exclude>
                         <exclude>com/navercorp/pinpoint/profiler/util/jdk/**/*.java</exclude>
-
-                        <!--google guava-->
-                        <exclude>com/google/**/*.java</exclude>
                     </excludes>
                 </configuration>
             </plugin>
@@ -1010,9 +995,6 @@
                         <exclude>com/navercorp/pinpoint/common/util/apache/**/*.java</exclude>
                         <exclude>com/navercorp/pinpoint/common/util/jsr166/**/*.java</exclude>
                         <exclude>com/navercorp/pinpoint/profiler/util/jdk/**/*.java</exclude>
-
-                        <!--google guava-->
-                        <exclude>com/google/**/*.java</exclude>
                     </excludes>
                 </configuration>
             </plugin>

diff --git a/profiler-test/pom.xml b/profiler-test/pom.xml
@@ -68,8 +68,8 @@
             <artifactId>pinpoint-rpc</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.navercorp.pinpoint</groupId>
-            <artifactId>pinpoint-google-guava</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
 

diff --git a/profiler/pom.xml b/profiler/pom.xml
@@ -57,8 +57,8 @@
             <artifactId>pinpoint-rpc</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.navercorp.pinpoint</groupId>
-            <artifactId>pinpoint-google-guava</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
         <dependency>
             <groupId>com.google.inject</groupId>

diff --git a/thirdparty/.gitignore b/thirdparty/.gitignore
diff --git a/thirdparty/README.md b/thirdparty/README.md
diff --git a/thirdparty/clover.license b/thirdparty/clover.license
diff --git a/thirdparty/google-guava/.gitignore b/thirdparty/google-guava/.gitignore
diff --git a/thirdparty/google-guava/CONTRIBUTORS b/thirdparty/google-guava/CONTRIBUTORS
diff --git a/thirdparty/google-guava/COPYING b/thirdparty/google-guava/COPYING
diff --git a/thirdparty/google-guava/README.md b/thirdparty/google-guava/README.md
diff --git a/thirdparty/google-guava/clover.license b/thirdparty/google-guava/clover.license