This is an automated email from the ASF dual-hosted git repository. hxd pushed a commit to branch calldepversion in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 7fbbc1f6b3459ea40d1f0f9399f4f5bcf32fa324 Author: xiangdong huang <[email protected]> AuthorDate: Sun May 1 21:51:31 2022 +0800 replace all dependency version as parameters; enable library-udf and finx code style --- cli/pom.xml | 5 +- cluster/pom.xml | 4 +- consensus/pom.xml | 7 +- hive-connector/pom.xml | 6 +- influxdb-protocol/pom.xml | 3 +- .../iotdb/db/integration/env/StandaloneEnv.java | 44 +++++---- jdbc/pom.xml | 9 +- library-udf/pom.xml | 11 +-- .../apache/iotdb/library/dprofile/UDTFPACF.java | 1 - .../iotdb/library/dprofile/util/MADSketch.java | 5 +- .../library/drepair/util/TimestampInterval.java | 6 +- .../library/drepair/util/TimestampRepair.java | 2 +- .../iotdb/library/frequency/FrequencyTests.java | 18 ++-- metrics/dropwizard-metrics/pom.xml | 10 +- metrics/interface/pom.xml | 6 +- pom.xml | 106 +++++++++++++-------- procedure/pom.xml | 4 +- server/pom.xml | 16 ++-- 18 files changed, 164 insertions(+), 99 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 05c8eec8ac..9c70fb0ebc 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -33,6 +33,7 @@ <cli.test.skip>false</cli.test.skip> <cli.it.skip>${cli.test.skip}</cli.it.skip> <cli.ut.skip>${cli.test.skip}</cli.ut.skip> + <commons-csv.version>1.9.0</commons-csv.version> </properties> <dependencies> <dependency> @@ -63,7 +64,7 @@ <dependency> <groupId>me.tongfei</groupId> <artifactId>progressbar</artifactId> - <version>0.9.2</version> + <version>${progressbar.version}</version> </dependency> <dependency> <groupId>org.jline</groupId> @@ -89,7 +90,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-csv</artifactId> - <version>1.9.0</version> + <version>${commons-csv.version}</version> </dependency> <dependency> <groupId>org.mockito</groupId> diff --git a/cluster/pom.xml b/cluster/pom.xml index 27a88b0b13..61f5b652fb 100644 --- a/cluster/pom.xml +++ b/cluster/pom.xml @@ -40,7 +40,7 @@ <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> - <version>0.14.1</version> + <version>${thrift.version}</version> </dependency> <dependency> <groupId>org.apache.iotdb</groupId> @@ -106,7 +106,7 @@ <dependency> <groupId>org.awaitility</groupId> <artifactId>awaitility</artifactId> - <version>4.0.2</version> + <version>${awaitility.version}</version> <scope>test</scope> </dependency> <!-- for mocked test--> diff --git a/consensus/pom.xml b/consensus/pom.xml index f773dd846a..7284a5fee7 100644 --- a/consensus/pom.xml +++ b/consensus/pom.xml @@ -34,17 +34,17 @@ <dependency> <groupId>org.apache.ratis</groupId> <artifactId>ratis-server</artifactId> - <version>2.2.0</version> + <version>${ratis.version}</version> </dependency> <dependency> <groupId>org.apache.ratis</groupId> <artifactId>ratis-common</artifactId> - <version>2.2.0</version> + <version>${ratis.version}</version> </dependency> <dependency> <groupId>org.apache.ratis</groupId> <artifactId>ratis-grpc</artifactId> - <version>2.2.0</version> + <version>${ratis.version}</version> </dependency> <dependency> <groupId>org.apache.iotdb</groupId> @@ -56,5 +56,6 @@ <properties> <maven.compiler.source>8</maven.compiler.source> <maven.compiler.target>8</maven.compiler.target> + <ratis.version>2.2.0</ratis.version> </properties> </project> diff --git a/hive-connector/pom.xml b/hive-connector/pom.xml index 7e420df1dd..dd46b81fd0 100644 --- a/hive-connector/pom.xml +++ b/hive-connector/pom.xml @@ -32,6 +32,8 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compile.version>1.8</compile.version> + <orc-core.version>1.6.0</orc-core.version> + <hive-storage-api.version>2.6.1</hive-storage-api.version> </properties> <dependencies> <dependency> @@ -74,14 +76,14 @@ <dependency> <groupId>org.apache.orc</groupId> <artifactId>orc-core</artifactId> - <version>1.6.0</version> + <version>${orc-core.version}</version> </dependency> <!-- orc-core 1.6 uses hive-storage-api 2.6.0, while hive-serde 2.8.4 uses 2.4.0, so we explicitly claim it.--> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-storage-api</artifactId> - <version>2.6.1</version> + <version>${hive-storage-api.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> diff --git a/influxdb-protocol/pom.xml b/influxdb-protocol/pom.xml index 82344019d1..f964e4621e 100644 --- a/influxdb-protocol/pom.xml +++ b/influxdb-protocol/pom.xml @@ -36,6 +36,7 @@ <influxdb.ut.skip>${influxdb.test.skip}</influxdb.ut.skip> <maven.compiler.source>8</maven.compiler.source> <maven.compiler.target>8</maven.compiler.target> + <influxdb-java.version>2.21</influxdb-java.version> </properties> <dependencies> <dependency> @@ -61,7 +62,7 @@ <dependency> <groupId>org.influxdb</groupId> <artifactId>influxdb-java</artifactId> - <version>2.21</version> + <version>${influxdb-java.version}</version> </dependency> <dependency> <groupId>junit</groupId> diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/env/StandaloneEnv.java b/integration/src/test/java/org/apache/iotdb/db/integration/env/StandaloneEnv.java index e392c71720..4de314a8ed 100644 --- a/integration/src/test/java/org/apache/iotdb/db/integration/env/StandaloneEnv.java +++ b/integration/src/test/java/org/apache/iotdb/db/integration/env/StandaloneEnv.java @@ -68,29 +68,39 @@ public class StandaloneEnv implements BaseEnv { @Override public Connection getConnection() throws SQLException { - try { - Class.forName(Config.JDBC_DRIVER_NAME); - connection = - DriverManager.getConnection(Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - fail(); + if (connection != null) { + try { + Class.forName(Config.JDBC_DRIVER_NAME); + connection = + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + fail(); + } } return connection; } @Override public Connection getConnection(Constant.Version version) throws SQLException { - try { - Class.forName(Config.JDBC_DRIVER_NAME); - connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667" + "?" + VERSION + "=" + version.toString(), - "root", - "root"); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - fail(); + if (connection != null) { + try { + Class.forName(Config.JDBC_DRIVER_NAME); + connection = + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + + "127.0.0.1:6667" + + "?" + + VERSION + + "=" + + version.toString(), + "root", + "root"); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + fail(); + } } return connection; } diff --git a/jdbc/pom.xml b/jdbc/pom.xml index e7ab47235a..be78f0ae2f 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -34,6 +34,9 @@ <jdbc.test.skip>false</jdbc.test.skip> <jdbc.it.skip>${jdbc.test.skip}</jdbc.it.skip> <jdbc.ut.skip>${jdbc.test.skip}</jdbc.ut.skip> + <osgi.cmpn.version>6.0.0</osgi.cmpn.version> + <pax-jdbc-common.version>1.4.5</pax-jdbc-common.version> + <org.osgi.core.version>6.0.0</org.osgi.core.version> </properties> <dependencies> <dependency> @@ -44,17 +47,17 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>osgi.cmpn</artifactId> - <version>6.0.0</version> + <version>${osgi.cmpn.version}</version> </dependency> <dependency> <groupId>org.ops4j.pax.jdbc</groupId> <artifactId>pax-jdbc-common</artifactId> - <version>1.4.5</version> + <version>${pax-jdbc-common.version}</version> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> - <version>6.0.0</version> + <version>${org.osgi.core.version}</version> </dependency> <dependency> <groupId>org.mockito</groupId> diff --git a/library-udf/pom.xml b/library-udf/pom.xml index 632b73f634..eae0d16b1b 100644 --- a/library-udf/pom.xml +++ b/library-udf/pom.xml @@ -27,7 +27,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>library-udf</artifactId> - <version>2.0.0</version> <properties> <maven.compiler.source>8</maven.compiler.source> <maven.compiler.target>8</maven.compiler.target> @@ -36,24 +35,24 @@ <dependency> <groupId>org.eclipse.collections</groupId> <artifactId>eclipse-collections</artifactId> - <version>10.4.0</version> + <version>${eclipse-collections.version}</version> </dependency> <dependency> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-server</artifactId> - <version>${project.parent.version}</version> + <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.iotdb</groupId> <artifactId>tsfile</artifactId> - <version>${project.parent.version}</version> + <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-session</artifactId> - <version>${project.parent.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -103,7 +102,7 @@ <dependency> <groupId>org.apache.iotdb</groupId> <artifactId>integration</artifactId> - <version>0.13.0-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/library-udf/src/main/java/org/apache/iotdb/library/dprofile/UDTFPACF.java b/library-udf/src/main/java/org/apache/iotdb/library/dprofile/UDTFPACF.java index b444739183..fa92dc1135 100644 --- a/library-udf/src/main/java/org/apache/iotdb/library/dprofile/UDTFPACF.java +++ b/library-udf/src/main/java/org/apache/iotdb/library/dprofile/UDTFPACF.java @@ -29,7 +29,6 @@ import org.apache.iotdb.library.dprofile.util.YuleWalker; import org.apache.iotdb.library.util.Util; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.commons.math3.linear.*; import org.apache.commons.math3.stat.StatUtils; import java.util.ArrayList; diff --git a/library-udf/src/main/java/org/apache/iotdb/library/dprofile/util/MADSketch.java b/library-udf/src/main/java/org/apache/iotdb/library/dprofile/util/MADSketch.java index 2004f9e588..76bad325f0 100644 --- a/library-udf/src/main/java/org/apache/iotdb/library/dprofile/util/MADSketch.java +++ b/library-udf/src/main/java/org/apache/iotdb/library/dprofile/util/MADSketch.java @@ -20,7 +20,10 @@ package org.apache.iotdb.library.dprofile.util; import org.eclipse.collections.impl.map.mutable.UnifiedMap; -import java.util.*; +import java.util.Arrays; +import java.util.Comparator; +import java.util.Map; +import java.util.NoSuchElementException; public class MADSketch { diff --git a/library-udf/src/main/java/org/apache/iotdb/library/drepair/util/TimestampInterval.java b/library-udf/src/main/java/org/apache/iotdb/library/drepair/util/TimestampInterval.java index ed1414b039..626e6b51fe 100644 --- a/library-udf/src/main/java/org/apache/iotdb/library/drepair/util/TimestampInterval.java +++ b/library-udf/src/main/java/org/apache/iotdb/library/drepair/util/TimestampInterval.java @@ -18,7 +18,11 @@ */ package org.apache.iotdb.library.drepair.util; -import java.util.*; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; public class TimestampInterval { diff --git a/library-udf/src/main/java/org/apache/iotdb/library/drepair/util/TimestampRepair.java b/library-udf/src/main/java/org/apache/iotdb/library/drepair/util/TimestampRepair.java index 54e7769401..a6172fb89d 100644 --- a/library-udf/src/main/java/org/apache/iotdb/library/drepair/util/TimestampRepair.java +++ b/library-udf/src/main/java/org/apache/iotdb/library/drepair/util/TimestampRepair.java @@ -22,7 +22,7 @@ import org.apache.iotdb.db.query.udf.api.access.Row; import org.apache.iotdb.db.query.udf.api.access.RowIterator; import org.apache.iotdb.library.util.Util; -import java.util.*; +import java.util.ArrayList; public class TimestampRepair { diff --git a/library-udf/src/test/java/org/apache/iotdb/library/frequency/FrequencyTests.java b/library-udf/src/test/java/org/apache/iotdb/library/frequency/FrequencyTests.java index 9d3f1b5f55..53b880555b 100644 --- a/library-udf/src/test/java/org/apache/iotdb/library/frequency/FrequencyTests.java +++ b/library-udf/src/test/java/org/apache/iotdb/library/frequency/FrequencyTests.java @@ -35,7 +35,11 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import java.sql.*; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; import static org.junit.Assert.fail; @@ -66,32 +70,32 @@ public class FrequencyTests { } private static void createTimeSeries() throws MetadataException { - IoTDB.metaManager.setStorageGroup(new PartialPath("root.vehicle")); - IoTDB.metaManager.createTimeseries( + IoTDB.schemaProcessor.setStorageGroup(new PartialPath("root.vehicle")); + IoTDB.schemaProcessor.createTimeseries( new PartialPath("root.vehicle.d1.s1"), TSDataType.DOUBLE, TSEncoding.PLAIN, CompressionType.UNCOMPRESSED, null); - IoTDB.metaManager.createTimeseries( + IoTDB.schemaProcessor.createTimeseries( new PartialPath("root.vehicle.d1.s2"), TSDataType.DOUBLE, TSEncoding.PLAIN, CompressionType.UNCOMPRESSED, null); - IoTDB.metaManager.createTimeseries( + IoTDB.schemaProcessor.createTimeseries( new PartialPath("root.vehicle.d1.s3"), TSDataType.DOUBLE, TSEncoding.PLAIN, CompressionType.UNCOMPRESSED, null); - IoTDB.metaManager.createTimeseries( + IoTDB.schemaProcessor.createTimeseries( new PartialPath("root.vehicle.d2.s1"), TSDataType.DOUBLE, TSEncoding.PLAIN, CompressionType.UNCOMPRESSED, null); - IoTDB.metaManager.createTimeseries( + IoTDB.schemaProcessor.createTimeseries( new PartialPath("root.vehicle.d2.s2"), TSDataType.DOUBLE, TSEncoding.PLAIN, diff --git a/metrics/dropwizard-metrics/pom.xml b/metrics/dropwizard-metrics/pom.xml index 4f0c984706..650677f1ba 100644 --- a/metrics/dropwizard-metrics/pom.xml +++ b/metrics/dropwizard-metrics/pom.xml @@ -31,7 +31,7 @@ <dependency> <groupId>org.apache.iotdb</groupId> <artifactId>metrics-interface</artifactId> - <version>0.14.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> @@ -46,13 +46,17 @@ <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-core</artifactId> - <version>1.9</version> + <version>${jersey-core.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.projectreactor.netty</groupId> <artifactId>reactor-netty-http</artifactId> - <version>1.0.4</version> + <version>${reactor-netty-http.version}</version> </dependency> </dependencies> + <properties> + <jersey-core.version>1.9</jersey-core.version> + <reactor-netty-http.version>1.0.4</reactor-netty-http.version> + </properties> </project> diff --git a/metrics/interface/pom.xml b/metrics/interface/pom.xml index 23ca8a1357..500264d55c 100644 --- a/metrics/interface/pom.xml +++ b/metrics/interface/pom.xml @@ -21,6 +21,9 @@ --> <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/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> + <properties> + <snakeyaml.version>1.17</snakeyaml.version> + </properties> <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-metrics</artifactId> @@ -29,14 +32,13 @@ </parent> <artifactId>metrics-interface</artifactId> <name>metric interface</name> - <version>0.14.0-SNAPSHOT</version> <description>Metrics interface for IoTDB</description> <url>https://github.com/thulab/iotdb/tree/master/tsfile</url> <dependencies> <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> - <version>1.17</version> + <version>${snakeyaml.version}</version> </dependency> <dependency> <groupId>org.apache.iotdb</groupId> diff --git a/pom.xml b/pom.xml index 2840b10274..a5f29b343a 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,7 @@ <module>integration</module> <module>consensus</module> <module>procedure</module> - <!-- <module>library-udf</module>--> + <module>library-udf</module> </modules> <!-- Properties Management --> <properties> @@ -178,6 +178,40 @@ <swagger.core.version>1.5.18</swagger.core.version> <servlet.api.version>2.5</servlet.api.version> <openapi.generator.version>5.0.0</openapi.generator.version> + <!-- cli --> + <progressbar.version>0.9.2</progressbar.version> + <!-- for java 11--> + <javax.annotation-api.version>1.3.2</javax.annotation-api.version> + <log4j.version>1.2.17</log4j.version> + <lz4-java.version>1.8.0</lz4-java.version> + <jackson-mapper-asl.version>1.9.13</jackson-mapper-asl.version> + <jaxb-runtime.version>3.0.2</jaxb-runtime.version> + <mockito-core.version>2.23.0</mockito-core.version> + <objenesis.version>3.2</objenesis.version> + <powermock-core.version>2.0.9</powermock-core.version> + <scalatest_2.11.version>3.0.5</scalatest_2.11.version> + <io.airlift.units.version>1.6</io.airlift.units.version> + <io.airlift.slice.version>0.41</io.airlift.slice.version> + <io.airlift.stats.version>200</io.airlift.stats.version> + <!-- do not upgrade this package unless we have to... + Some experiments(https://github.com/jixuan1989/DependencyTest/blob/main/src/main/java/timecho/exp/JolTimeCost.java): + jol v0.2, scan tsfile package and calculate the classes size, time cost: 600ms + jol v0.4: time cost is 980ms, + jol v0.14, time cost is 1600ms + --> + <jol-core.version>0.2</jol-core.version> + <jackson-core-asl.version>1.9.13</jackson-core-asl.version> + <mqtt-client.version>1.12</mqtt-client.version> + <google.code.findbugs.jsr305.version>3.0.2</google.code.findbugs.jsr305.version> + <jna.version>5.5.0</jna.version> + <zookeeper.version>3.4.9</zookeeper.version> + <commons-beanutils.version>1.9.4</commons-beanutils.version> + <commons-compress.version>1.21</commons-compress.version> + <error_prone_annotations.version>2.7.1</error_prone_annotations.version> + <jetty-server.version>11.0.6</jetty-server.version> + <testcontainers.version>1.15.2</testcontainers.version> + <eclipse-collections.version>10.4.0</eclipse-collections.version> + <awaitility.version>4.0.2</awaitility.version> </properties> <!-- if we claim dependencies in dependencyManagement, then we do not claim @@ -250,11 +284,6 @@ <artifactId>commons-logging</artifactId> <version>${common.logging.version}</version> </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - <version>3.9.9.Final</version> - </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-all</artifactId> @@ -273,7 +302,7 @@ <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> - <version>1.3.2</version> + <version>${javax.annotation-api.version}</version> </dependency> <dependency> <groupId>javax.xml.bind</groupId> @@ -293,12 +322,12 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.17</version> + <version>${log4j.version}</version> </dependency> <dependency> <groupId>org.lz4</groupId> <artifactId>lz4-java</artifactId> - <version>1.8.0</version> + <version>${lz4-java.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> @@ -313,7 +342,7 @@ <dependency> <groupId>me.tongfei</groupId> <artifactId>progressbar</artifactId> - <version>0.9.2</version> + <version>${progressbar.version}</version> <exclusions> <!-- This transitive dependency duplicates classes from jline:jline:jar:2.14.5:compile --> <exclusion> @@ -376,17 +405,17 @@ <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> - <version>1.9.13</version> + <version>${jackson-core-asl.version}</version> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.13</version> + <version>${jackson-mapper-asl.version}</version> </dependency> <dependency> <groupId>org.glassfish.jaxb</groupId> <artifactId>jaxb-runtime</artifactId> - <version>3.0.2</version> + <version>${jaxb-runtime.version}</version> <exclusions> <exclusion> <groupId>jakarta.activation</groupId> @@ -394,35 +423,36 @@ </exclusion> </exclusions> </dependency> - <dependency> + <!-- <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> <version>3.24.1-GA</version> - </dependency> + </dependency>--> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>2.23.0</version> - </dependency> - <dependency> - <groupId>org.objenesis</groupId> - <artifactId>objenesis</artifactId> - <version>3.0.1</version> + <version>${mockito-core.version}</version> </dependency> + <!-- for generate a class instance. (where to use it ?)--> + <!-- <dependency>--> + <!-- <groupId>org.objenesis</groupId>--> + <!-- <artifactId>objenesis</artifactId>--> + <!-- <version>${objenesis.version}</version>--> + <!-- </dependency>--> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-core</artifactId> - <version>2.0.2</version> + <version>${powermock-core.version}</version> </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-api-mockito2</artifactId> - <version>2.0.9</version> + <version>${powermock-core.version}</version> </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-module-junit4</artifactId> - <version>2.0.2</version> + <version>${powermock-core.version}</version> </dependency> <dependency> <groupId>org.scala-lang</groupId> @@ -437,7 +467,7 @@ <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_2.11</artifactId> - <version>3.0.5</version> + <version>${scalatest_2.11.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -486,7 +516,7 @@ <dependency> <groupId>io.airlift</groupId> <artifactId>units</artifactId> - <version>1.6</version> + <version>${io.airlift.units.version}</version> </dependency> <dependency> <groupId>io.airlift</groupId> @@ -496,29 +526,29 @@ <dependency> <groupId>io.airlift</groupId> <artifactId>slice</artifactId> - <version>0.41</version> + <version>${io.airlift.slice.version}</version> </dependency> <dependency> <groupId>io.airlift</groupId> <artifactId>stats</artifactId> - <version>200</version> + <version>${io.airlift.stats.version}</version> </dependency> <dependency> <groupId>org.openjdk.jol</groupId> <artifactId>jol-core</artifactId> - <version>0.2</version> + <version>${jol-core.version}</version> </dependency> <dependency> <groupId>org.fusesource.mqtt-client</groupId> <artifactId>mqtt-client</artifactId> - <version>1.12</version> + <version>${mqtt-client.version}</version> </dependency> <!-- many dependencies (hadoop, spark, hive, flink) use findbugs but with different version...--> <dependency> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> <!-- spark uses the lastest version than hive, flink and hadoop--> - <version>3.0.2</version> + <version>${google.code.findbugs.jsr305.version}</version> </dependency> <dependency> <groupId>com.google.code.gson</groupId> @@ -529,24 +559,24 @@ <dependency> <groupId>net.java.dev.jna</groupId> <artifactId>jna</artifactId> - <version>5.5.0</version> + <version>${jna.version}</version> </dependency> <!-- for hadoop connector --> <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.9</version> + <version>${zookeeper.version}</version> </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.9.4</version> + <version>${commons-beanutils.version}</version> </dependency> <!-- for test-container and hadoop conflict--> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> - <version>1.21</version> + <version>${commons-compress.version}</version> </dependency> <!-- for spark-iotdb-connector and hadoop connector conflict --> <dependency> @@ -558,7 +588,7 @@ <dependency> <groupId>com.google.errorprone</groupId> <artifactId>error_prone_annotations</artifactId> - <version>2.7.1</version> + <version>${error_prone_annotations.version}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -569,7 +599,7 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>11.0.6</version> + <version>${jetty-server.version}</version> </dependency> </dependencies> </dependencyManagement> @@ -590,7 +620,7 @@ <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers</artifactId> - <version>1.15.2</version> + <version>${testcontainers.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/procedure/pom.xml b/procedure/pom.xml index 1ce812eefb..c067c2250c 100644 --- a/procedure/pom.xml +++ b/procedure/pom.xml @@ -35,7 +35,7 @@ <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> - <version>0.14.1</version> + <version>${thrift.version}</version> </dependency> <dependency> <groupId>commons-io</groupId> @@ -66,7 +66,7 @@ <dependency> <groupId>org.awaitility</groupId> <artifactId>awaitility</artifactId> - <version>4.0.2</version> + <version>${awaitility.version}</version> <scope>test</scope> </dependency> <!-- for mocked test--> diff --git a/server/pom.xml b/server/pom.xml index 791dd03a5a..d7a2922614 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -33,6 +33,9 @@ <iotdb.test.skip>false</iotdb.test.skip> <iotdb.it.skip>${iotdb.test.skip}</iotdb.it.skip> <iotdb.ut.skip>${iotdb.test.skip}</iotdb.ut.skip> + <jjwt-api.version>0.10.8</jjwt-api.version> + <oauth2-oidc-sdk.version>8.3</oauth2-oidc-sdk.version> + <tomcat-embed-core.version>10.1.0-M1</tomcat-embed-core.version> </properties> <dependencies> <dependency> @@ -164,38 +167,37 @@ <dependency> <groupId>org.awaitility</groupId> <artifactId>awaitility</artifactId> - <version>4.0.3</version> + <version>${awaitility.version}</version> <scope>test</scope> </dependency> - <!-- compile group: 'io.jsonwebtoken', name: 'jjwt', version: '0.9.1'--> <dependency> <groupId>io.jsonwebtoken</groupId> <artifactId>jjwt-api</artifactId> - <version>0.10.7</version> + <version>${jjwt-api.version}</version> </dependency> <!-- Impl --> <dependency> <groupId>io.jsonwebtoken</groupId> <artifactId>jjwt-impl</artifactId> - <version>0.10.8</version> + <version>${jjwt-api.version}</version> <scope>runtime</scope> </dependency> <!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt-jackson --> <dependency> <groupId>io.jsonwebtoken</groupId> <artifactId>jjwt-jackson</artifactId> - <version>0.10.8</version> + <version>${jjwt-api.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>com.nimbusds</groupId> <artifactId>oauth2-oidc-sdk</artifactId> - <version>8.3</version> + <version>${oauth2-oidc-sdk.version}</version> </dependency> <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-core</artifactId> - <version>8.5.46</version> + <version>${tomcat-embed-core.version}</version> <scope>test</scope> </dependency> <dependency>
