You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/12/11 09:22:40 UTC
[iotdb] branch remove_fastutil created (now 61bef3f)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch remove_fastutil
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
at 61bef3f remove fastutil
This branch includes the following new commits:
new 5a905fa Merge remote-tracking branch 'origin/rel/0.11' into rel/0.11
new 1303331 Merge remote-tracking branch 'origin/rel/0.11' into rel/0.11
new 61bef3f remove fastutil
The 3 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] 01/03: Merge remote-tracking branch 'origin/rel/0.11' into
rel/0.11
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch remove_fastutil
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 5a905faa00549932736abea185f69cc0ea022cb9
Merge: f046d8d bf4da30
Author: qiaojialin <64...@qq.com>
AuthorDate: Thu Dec 10 14:52:53 2020 +0800
Merge remote-tracking branch 'origin/rel/0.11' into rel/0.11
.../java/org/apache/iotdb/db/sync/sender/transfer/SyncClient.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[iotdb] 02/03: Merge remote-tracking branch 'origin/rel/0.11' into
rel/0.11
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch remove_fastutil
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 130333133133bffbff104c7791e18bd6022dced7
Merge: 5a905fa 8971ffc
Author: qiaojialin <64...@qq.com>
AuthorDate: Fri Dec 11 16:35:02 2020 +0800
Merge remote-tracking branch 'origin/rel/0.11' into rel/0.11
server/src/assembly/resources/conf/iotdb-engine.properties | 8 +++++++-
server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +-
.../src/main/java/org/apache/iotdb/db/service/RPCService.java | 10 ++++++----
.../apache/iotdb/db/service/thrift/ThriftServiceThread.java | 8 ++++----
.../org/apache/iotdb/db/sync/receiver/SyncServerManager.java | 4 +++-
5 files changed, 21 insertions(+), 11 deletions(-)
[iotdb] 03/03: remove fastutil
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch remove_fastutil
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 61bef3fda01d638d179d540a1599468eb7ce611e
Author: qiaojialin <64...@qq.com>
AuthorDate: Fri Dec 11 17:22:14 2020 +0800
remove fastutil
---
LICENSE-binary | 2 --
grafana/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
pom.xml | 6 +++---
server/pom.xml | 5 -----
.../test/java/org/apache/iotdb/db/integration/IOTDBInsertIT.java | 4 ++--
.../test/java/org/apache/iotdb/db/integration/IoTDBResultSetIT.java | 4 ++--
spark-iotdb-connector/pom.xml | 6 ------
8 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index e14d227..adf5967 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -223,7 +223,6 @@ org.apache.commons:commons-lang3:3.8.1
commons-lang:commons-lang:2.6
com.nimbusds:content-type:2.0
com.google.code.gson:gson:2.8.6
-it.unimi.dsi:fastutil:7.0.6
com.google.guava.guava:24.1.1
com.fasterxml.jackson.core:jackson-annotations:2.10.0
com.fasterxml.jackson.core:jackson-core:2.10.0
@@ -268,7 +267,6 @@ org.osgi:org.osgi.core:6.0.0
org.osgi:osgi.cmpn:6.0.0
org.ops4j.pax.jdbc:pax-jdbc-common:1.4.5
org.xerial.snappy:snappy-java:1.1.7.2
-com.clearspring.analytics:stream:2.9.5
io.airlift.airline:0.8
net.minidev:accessors-smart:1.2
diff --git a/grafana/pom.xml b/grafana/pom.xml
index a881396..9cfee39 100644
--- a/grafana/pom.xml
+++ b/grafana/pom.xml
@@ -165,7 +165,7 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/spring.schemas</resource>
</transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>${start-class}</mainClass>
</transformer>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index f2958c3..9d5d397 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -223,7 +223,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
diff --git a/pom.xml b/pom.xml
index 658cf06..e544bd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,7 +139,7 @@
<sonar.exclusions>**/generated-sources</sonar.exclusions>
<!-- By default, the argLine is empty-->
<gson.version>2.8.6</gson.version>
- <argLine />
+ <argLine/>
</properties>
<!--
if we claim dependencies in dependencyManagement, then we do not claim
@@ -599,7 +599,7 @@
<id>enforce-version-convergence</id>
<configuration>
<rules>
- <dependencyConvergence />
+ <dependencyConvergence/>
</rules>
</configuration>
<goals>
@@ -645,7 +645,7 @@
</requireJavaVersion>
<!-- Disabled for now as it breaks the ability to build single modules -->
<!--reactorModuleConvergence/-->
- <banVulnerable implementation="org.sonatype.ossindex.maven.enforcer.BanVulnerableDependencies" />
+ <banVulnerable implementation="org.sonatype.ossindex.maven.enforcer.BanVulnerableDependencies"/>
</rules>
</configuration>
</execution>
diff --git a/server/pom.xml b/server/pom.xml
index cd47626..127122a 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -156,11 +156,6 @@
<artifactId>powermock-api-mockito2</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.clearspring.analytics</groupId>
- <artifactId>stream</artifactId>
- <version>2.9.5</version>
- </dependency>
<!-- compile group: 'io.jsonwebtoken', name: 'jjwt', version: '0.9.1'-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IOTDBInsertIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IOTDBInsertIT.java
index a4599be..a66f2ed 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IOTDBInsertIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IOTDBInsertIT.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.integration;
-import com.clearspring.analytics.util.Lists;
+import java.util.ArrayList;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.junit.AfterClass;
@@ -43,7 +43,7 @@ import java.util.Objects;
* @time 27/9/20 20:56
**/
public class IOTDBInsertIT {
- private static List<String> sqls = Lists.newArrayList();
+ private static List<String> sqls = new ArrayList<>();
private static Connection connection;
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBResultSetIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBResultSetIT.java
index 4902832..f372170 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBResultSetIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBResultSetIT.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.integration;
-import com.clearspring.analytics.util.Lists;
+import java.util.ArrayList;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.junit.AfterClass;
@@ -42,7 +42,7 @@ import java.util.Objects;
* @time 27/9/20 22:56
**/
public class IoTDBResultSetIT {
- private static List<String> sqls = Lists.newArrayList();
+ private static List<String> sqls = new ArrayList<>();
private static Connection connection;
diff --git a/spark-iotdb-connector/pom.xml b/spark-iotdb-connector/pom.xml
index a734d87..438949b 100644
--- a/spark-iotdb-connector/pom.xml
+++ b/spark-iotdb-connector/pom.xml
@@ -49,12 +49,6 @@
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-server</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.clearspring.analytics</groupId>
- <artifactId>stream</artifactId>
- </exclusion>
- </exclusions>
<scope>test</scope>
</dependency>
<dependency>