You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by sn...@apache.org on 2019/01/18 09:19:19 UTC

[incubator-pinot] branch dependency-cleanup updated: Remove dependency of category X licenses.

This is an automated email from the ASF dual-hosted git repository.

snlee pushed a commit to branch dependency-cleanup
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git


The following commit(s) were added to refs/heads/dependency-cleanup by this push:
     new ead9b51  Remove dependency of category X licenses.
ead9b51 is described below

commit ead9b512e6ca5988b41783018abb122e0d534176
Author: Seunghyun Lee <sn...@linkedin.com>
AuthorDate: Fri Jan 18 01:18:57 2019 -0800

    Remove dependency of category X licenses.
    
    For an ASF project, its distribution should not contain any of work under
    category X license. After running "mvn project-info-reports:dependencies",
    three libraries are under category X libraries for our distribution package.
    This PR resolves this issue.
    
    1. Removed "pinot-perf" module from distribution package because pinot-perf
       module is pulling "jmh-core" based on GPL 2 license, which is a category X.
    2. Bumped up the version of org.testng from 6.0.1 to 6.11 because the old
       version was pulling in "org.beanshell:bsh:2.0b4", which is also based on
       LGPL license. The newer version no longer pulls beanshell.
    3. Bumped up the swagger version from 1.5.10 to 1.5.15. The old version was
       pulling "org.reflections:reflections:0.9.10", which pulls
       "com.google.code.findbugs:annotations", which was based on LGPL.
    
    For the list of category X licenses, please refer
    https://www.apache.org/legal/resolved.html
---
 pinot-distribution/pom.xml      |  4 ----
 pinot-integration-tests/pom.xml |  5 +++++
 pinot-perf/pom.xml              | 10 ++++++----
 pom.xml                         | 16 +++-------------
 4 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/pinot-distribution/pom.xml b/pinot-distribution/pom.xml
index f5dfa34..1dc17ff 100644
--- a/pinot-distribution/pom.xml
+++ b/pinot-distribution/pom.xml
@@ -84,10 +84,6 @@
       <groupId>org.apache.pinot</groupId>
       <artifactId>pinot-tools</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-perf</artifactId>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/pinot-integration-tests/pom.xml b/pinot-integration-tests/pom.xml
index eeb8e96..4743686 100644
--- a/pinot-integration-tests/pom.xml
+++ b/pinot-integration-tests/pom.xml
@@ -233,6 +233,11 @@
       </exclusions>
     </dependency>
     <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-minicluster</artifactId>
       <exclusions>
diff --git a/pinot-perf/pom.xml b/pinot-perf/pom.xml
index 7383731..a7ae81d 100644
--- a/pinot-perf/pom.xml
+++ b/pinot-perf/pom.xml
@@ -93,6 +93,7 @@
     <dependency>
       <groupId>org.openjdk.jmh</groupId>
       <artifactId>jmh-core</artifactId>
+      <version>1.15</version>
       <exclusions>
         <exclusion>
           <groupId>net.sf.jopt-simple</groupId>
@@ -101,14 +102,15 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>net.sf.jopt-simple</groupId>
-      <artifactId>jopt-simple</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.openjdk.jmh</groupId>
       <artifactId>jmh-generator-annprocess</artifactId>
+      <version>1.15</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>net.sf.jopt-simple</groupId>
+      <artifactId>jopt-simple</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/pom.xml b/pom.xml
index 07ac631..017efbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
     <jackson.version>2.8.3</jackson.version>
     <async-http-client.version>1.9.21</async-http-client.version>
     <jersey.version>2.23</jersey.version>
-    <swagger.version>1.5.10</swagger.version>
+    <swagger.version>1.5.15</swagger.version>
     <hadoop.version>2.7.0</hadoop.version>
     <antlr.version>4.6</antlr.version>
     <!-- commons-configuration, hadoop-common, hadoop-client use commons-lang -->
@@ -285,7 +285,7 @@
       <dependency>
         <groupId>org.testng</groupId>
         <artifactId>testng</artifactId>
-        <version>6.0.1</version>
+        <version>6.11</version>
       </dependency>
       <dependency>
         <groupId>me.lemire.integercompression</groupId>
@@ -305,7 +305,7 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>19.0</version>
+        <version>20.0</version>
       </dependency>
       <dependency>
         <groupId>com.microsoft.azure</groupId>
@@ -707,16 +707,6 @@
         <version>3.0.12</version>
       </dependency>
       <dependency>
-        <groupId>org.openjdk.jmh</groupId>
-        <artifactId>jmh-generator-annprocess</artifactId>
-        <version>1.8</version>
-      </dependency>
-      <dependency>
-        <groupId>org.openjdk.jmh</groupId>
-        <artifactId>jmh-core</artifactId>
-        <version>1.15</version>
-      </dependency>
-      <dependency>
         <groupId>args4j</groupId>
         <artifactId>args4j</artifactId>
         <version>2.32</version>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org