You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2020/11/08 14:33:11 UTC
[iotdb] branch fix_dependencies created (now d0ef72f)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch fix_dependencies
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
at d0ef72f fix conflict
This branch includes the following new commits:
new 593b06e force claim guava version to avoid version conflict in hadoop module
new c74a790 force claim guava version to avoid version conflict in hadoop module
new 4ce5b84 remove incubating keyword
new 116b0e5 fix dependencies Convergence
new d4587b7 force claim guava version to avoid version conflict in hadoop module
new d0ef72f fix conflict
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 04/06: fix dependencies Convergence
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch fix_dependencies
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 116b0e58f4066beaf2b4a1abc1b872f78d4ec3be
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sun Nov 8 22:13:33 2020 +0800
fix dependencies Convergence
---
hadoop/pom.xml | 2 +-
hive-connector/pom.xml | 15 ++++
pom.xml | 160 +++++++++++++++++++++---------------------
spark-iotdb-connector/pom.xml | 13 ++++
4 files changed, 109 insertions(+), 81 deletions(-)
diff --git a/hadoop/pom.xml b/hadoop/pom.xml
index f6227d1..6b33daa 100644
--- a/hadoop/pom.xml
+++ b/hadoop/pom.xml
@@ -57,7 +57,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>16.0.1</version>
+ <version>21.0</version>
</dependency>
</dependencies>
<build>
diff --git a/hive-connector/pom.xml b/hive-connector/pom.xml
index 77f3124..ae1bd5a 100644
--- a/hive-connector/pom.xml
+++ b/hive-connector/pom.xml
@@ -54,8 +54,19 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-storage-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <!-- many of hadoop dependencies use guava11, but org.apache.curator from hadoop-common uses
+ guava16 -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>21.0</version>
+ </dependency>
<!-- force upgrade the dependency of hive-serde-->
<dependency>
<groupId>org.apache.orc</groupId>
@@ -77,6 +88,10 @@
<groupId>org.antlr</groupId>
<artifactId>antlr-runtime</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 1505e0f..cdd086a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -584,6 +584,86 @@
</pluginManagement>
<plugins>
<!--
+ Strange things usually happen if you run with a too low Java version.
+ This plugin not only checks the minimum java version of 1.8, but also
+ checks all dependencies (and transitive dependencies) for reported CVEs.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0-M2</version>
+ <!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <!-- Ensure we're not mixing dependency versions -->
+ <execution>
+ <id>enforce-version-convergence</id>
+ <configuration>
+ <rules>
+ <dependencyConvergence/>
+ </rules>
+ </configuration>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </execution>
+ <!--
+ Fails the build if classes are included from multiple
+ artifacts and these are not identical.
+ -->
+ <!--execution>
+ <id>enforce-ban-duplicate-classes</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <banDuplicateClasses>
+ <scopes>
+ <scope>compile</scope>
+ <scope>provided</scope>
+ </scopes>
+ <findAllDuplicates>true</findAllDuplicates>
+ <ignoreWhenIdentical>true</ignoreWhenIdentical>
+ </banDuplicateClasses>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution-->
+ <!-- Make sure no dependencies are used for which known vulnerabilities exist. -->
+ <execution>
+ <id>vulnerability-checks</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <!-- Just generate warnings for now -->
+ <fail>false</fail>
+ <rules>
+ <requireJavaVersion>
+ <version>1.8.0</version>
+ </requireJavaVersion>
+ <!-- Disabled for now as it breaks the ability to build single modules -->
+ <!--reactorModuleConvergence/-->
+ <banVulnerable implementation="org.sonatype.ossindex.maven.enforcer.BanVulnerableDependencies"/>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.sonatype.ossindex.maven</groupId>
+ <artifactId>ossindex-maven-enforcer-rules</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>extra-enforcer-rules</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <!--
Even if Maven transitively pulls in dependencies, relying on these can
quite often cause hard to find problems. So it's a good practice to make
sure everything directly required is also directly added as a dependency.
@@ -1014,86 +1094,6 @@
</execution>
</executions>
</plugin>
- <!--
- Strange things usually happen if you run with a too low Java version.
- This plugin not only checks the minimum java version of 1.8, but also
- checks all dependencies (and transitive dependencies) for reported CVEs.
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M2</version>
- <!--$NO-MVN-MAN-VER$-->
- <executions>
- <!-- Ensure we're not mixing dependency versions -->
- <execution>
- <id>enforce-version-convergence</id>
- <configuration>
- <rules>
- <dependencyConvergence/>
- </rules>
- </configuration>
- <goals>
- <goal>enforce</goal>
- </goals>
- </execution>
- <!--
- Fails the build if classes are included from multiple
- artifacts and these are not identical.
- -->
- <!--execution>
- <id>enforce-ban-duplicate-classes</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <banDuplicateClasses>
- <scopes>
- <scope>compile</scope>
- <scope>provided</scope>
- </scopes>
- <findAllDuplicates>true</findAllDuplicates>
- <ignoreWhenIdentical>true</ignoreWhenIdentical>
- </banDuplicateClasses>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution-->
- <!-- Make sure no dependencies are used for which known vulnerabilities exist. -->
- <execution>
- <id>vulnerability-checks</id>
- <phase>validate</phase>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <!-- Just generate warnings for now -->
- <fail>false</fail>
- <rules>
- <requireJavaVersion>
- <version>1.8.0</version>
- </requireJavaVersion>
- <!-- Disabled for now as it breaks the ability to build single modules -->
- <!--reactorModuleConvergence/-->
- <banVulnerable implementation="org.sonatype.ossindex.maven.enforcer.BanVulnerableDependencies"/>
- </rules>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.sonatype.ossindex.maven</groupId>
- <artifactId>ossindex-maven-enforcer-rules</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>extra-enforcer-rules</artifactId>
- <version>1.2</version>
- </dependency>
- </dependencies>
- </plugin>
</plugins>
</build>
</profile>
diff --git a/spark-iotdb-connector/pom.xml b/spark-iotdb-connector/pom.xml
index b0700d5..2b0600c 100644
--- a/spark-iotdb-connector/pom.xml
+++ b/spark-iotdb-connector/pom.xml
@@ -60,6 +60,19 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- many of hadoop dependencies use guava11, but org.apache.curator from hadoop-common uses
+ guava16 -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>21.0</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
[iotdb] 02/06: force claim guava version to avoid version conflict
in hadoop module
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch fix_dependencies
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c74a790a10299fdf127331aad3649e96f91cfd69
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sun Nov 8 17:12:36 2020 +0800
force claim guava version to avoid version conflict in hadoop module
---
hadoop/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/hadoop/pom.xml b/hadoop/pom.xml
index 337cf2b..f6227d1 100644
--- a/hadoop/pom.xml
+++ b/hadoop/pom.xml
@@ -45,6 +45,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- many of hadoop dependencies use guava11, but org.apache.curator from hadoop-common uses
guava16 -->
[iotdb] 05/06: force claim guava version to avoid version conflict
in hadoop module
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch fix_dependencies
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit d4587b75991d8f922949989080397953e689cc24
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sun Nov 8 11:40:47 2020 +0800
force claim guava version to avoid version conflict in hadoop module
---
hadoop/pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/hadoop/pom.xml b/hadoop/pom.xml
index 6b33daa..4b41771 100644
--- a/hadoop/pom.xml
+++ b/hadoop/pom.xml
@@ -59,6 +59,13 @@
<artifactId>guava</artifactId>
<version>21.0</version>
</dependency>
+ <!-- many of hadoop dependencies use guava11, but org.apache.curator from hadoop-common uses
+ guava16 -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>16.0.1</version>
+ </dependency>
</dependencies>
<build>
<plugins>
[iotdb] 06/06: fix conflict
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch fix_dependencies
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit d0ef72fbd6eec646130370facb1a18e3d550e8c0
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sun Nov 8 17:12:36 2020 +0800
fix conflict
---
hadoop/pom.xml | 7 -------
1 file changed, 7 deletions(-)
diff --git a/hadoop/pom.xml b/hadoop/pom.xml
index 4b41771..6b33daa 100644
--- a/hadoop/pom.xml
+++ b/hadoop/pom.xml
@@ -59,13 +59,6 @@
<artifactId>guava</artifactId>
<version>21.0</version>
</dependency>
- <!-- many of hadoop dependencies use guava11, but org.apache.curator from hadoop-common uses
- guava16 -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>16.0.1</version>
- </dependency>
</dependencies>
<build>
<plugins>
[iotdb] 03/06: remove incubating keyword
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch fix_dependencies
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 4ce5b84baa5ef5ed73eb5d9995ec8abfd3686081
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sun Nov 8 17:33:03 2020 +0800
remove incubating keyword
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 86daaca..1505e0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -951,7 +951,7 @@
</plugins>
</build>
</profile>
- <!-- Make sure the source assembly has the right name (includes "incubating") -->
+ <!-- Make sure the source assembly has the right name -->
<profile>
<id>apache-release</id>
<build>
@@ -973,7 +973,7 @@
See https://issues.apache.org/jira/browse/MNG-5454 sigh.
-->
<configuration combine.self="append">
- <finalName>apache-iotdb-${project.version}-incubating</finalName>
+ <finalName>apache-iotdb-${project.version}</finalName>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
@@ -1006,7 +1006,7 @@
<fileSet>
<directory>${project.build.directory}</directory>
<includes>
- <include>apache-iotdb-${project.version}-incubating-source-release.zip</include>
+ <include>apache-iotdb-${project.version}-source-release.zip</include>
</includes>
</fileSet>
</fileSets>
[iotdb] 01/06: force claim guava version to avoid version conflict
in hadoop module
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch fix_dependencies
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 593b06e3cb7555014d41cd5a492d6ef589608a5c
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sun Nov 8 11:40:47 2020 +0800
force claim guava version to avoid version conflict in hadoop module
---
hadoop/pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/hadoop/pom.xml b/hadoop/pom.xml
index df3087c..337cf2b 100644
--- a/hadoop/pom.xml
+++ b/hadoop/pom.xml
@@ -46,6 +46,13 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
</dependency>
+ <!-- many of hadoop dependencies use guava11, but org.apache.curator from hadoop-common uses
+ guava16 -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>16.0.1</version>
+ </dependency>
</dependencies>
<build>
<plugins>