mirror of https://github.com/apache/iotdb
upgrade netty and claim exclusion for enforcer check (#3347)
This commit is contained in:
Xiangdong Huang
GitHub
parent
e70012965c
commit
4bb101c88e
|
|
@ -49,7 +49,7 @@ jobs:
|
|||
restore-keys: ${{ runner.os }}-m2-
|
||||
- name: IT/UT Test
|
||||
# we do not compile client-cpp for saving time, it is tested in client.yml
|
||||
run: mvn -B clean post-integration-test -Dtest.port.closed=true -Pcode-coverage -P '!testcontainer'
|
||||
run: mvn -B clean compile post-integration-test -Dtest.port.closed=true -Pcode-coverage -P '!testcontainer'
|
||||
- name: Code Coverage (Coveralls)
|
||||
if: ${{ success() && (github.event_name == 'pull_request_target')}}
|
||||
run: |
|
||||
|
|
|
|||
|
|
@ -251,16 +251,16 @@ io.dropwizard.metrics:metrics-json:3.2.6
|
|||
io.dropwizard.metrics:metrics-jvm:3.2.6
|
||||
com.librato.metrics:metrics-librato:5.1.0
|
||||
de.fraunhofer.iosb.io.moquette:moquette-broker:0.14.3
|
||||
io.netty:netty-buffer:4.1.27.Final
|
||||
io.netty:netty-codec:4.1.27.Final
|
||||
io.netty:netty-codec-http:4.1.27.Final
|
||||
io.netty:netty-codec-mqtt:4.1.27.Final
|
||||
io.netty:netty-common:4.1.27.Final
|
||||
io.netty:netty-handler:4.1.27.Final
|
||||
io.netty:netty-resolver:4.1.27.Final
|
||||
io.netty:netty-transport:4.1.27.Final
|
||||
io.netty:netty-transport-native-epoll:4.1.27.Final:linux-x86_64
|
||||
io.netty:netty-transport-native-unix-common:4.1.27.Final
|
||||
io.netty:netty-buffer:4.1.53.Final
|
||||
io.netty:netty-codec:4.1.53.Final
|
||||
io.netty:netty-codec-http:4.1.53.Final
|
||||
io.netty:netty-codec-mqtt:4.1.53.Final
|
||||
io.netty:netty-common:4.1.53.Final
|
||||
io.netty:netty-handler:4.1.53.Final
|
||||
io.netty:netty-resolver:4.1.53.Final
|
||||
io.netty:netty-transport:4.1.53.Final
|
||||
io.netty:netty-transport-native-epoll:4.1.53.Final:linux-x86_64
|
||||
io.netty:netty-transport-native-unix-common:4.1.53.Final
|
||||
com.nimbusds:nimbus-jose-jwt:8.14.1
|
||||
com.nimbusds:oauth2-oidc-sdk:8.3
|
||||
org.osgi:org.osgi.core:6.0.0
|
||||
|
|
|
|||
|
|
@ -50,6 +50,24 @@
|
|||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
</exclusion>
|
||||
<!--commons-configuration uses commons-lang:commons-lang:2.4
|
||||
while others use commons-lang 2.6-->
|
||||
<exclusion>
|
||||
<groupId>commons-configuration</groupId>
|
||||
<artifactId>commons-configuration</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<!-- this is just used by hadoop-common-->
|
||||
<dependency>
|
||||
<groupId>commons-configuration</groupId>
|
||||
<artifactId>commons-configuration</artifactId>
|
||||
<version>1.6</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>commons-lang</groupId>
|
||||
<artifactId>commons-lang</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<!-- many of hadoop dependencies use guava11, but org.apache.curator from hadoop-common uses
|
||||
|
|
|
|||
|
|
@ -95,6 +95,10 @@
|
|||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>commons-lang</groupId>
|
||||
<artifactId>commons-lang</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
|
|
|||
8
pom.xml
8
pom.xml
|
|
@ -140,6 +140,7 @@
|
|||
<javax.xml.bind.version>2.4.0-b180725.0427</javax.xml.bind.version>
|
||||
<felix.version>5.1.1</felix.version>
|
||||
<snappy.version>1.1.8.4</snappy.version>
|
||||
<netty.version>4.1.53.Final</netty.version>
|
||||
<!-- URL of the ASF SonarQube server -->
|
||||
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
|
||||
<sonar.organization>apache</sonar.organization>
|
||||
|
|
@ -236,17 +237,17 @@
|
|||
<dependency>
|
||||
<groupId>io.netty</groupId>
|
||||
<artifactId>netty-all</artifactId>
|
||||
<version>4.1.27.Final</version>
|
||||
<version>${netty.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.netty</groupId>
|
||||
<artifactId>netty-buffer</artifactId>
|
||||
<version>4.1.27.Final</version>
|
||||
<version>${netty.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.netty</groupId>
|
||||
<artifactId>netty-common</artifactId>
|
||||
<version>4.1.27.Final</version>
|
||||
<version>${netty.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.annotation</groupId>
|
||||
|
|
@ -702,6 +703,7 @@
|
|||
<!-- Ensure we're not mixing dependency versions -->
|
||||
<execution>
|
||||
<id>enforce-version-convergence</id>
|
||||
<phase>validate</phase>
|
||||
<configuration>
|
||||
<rules>
|
||||
<dependencyConvergence/>
|
||||
|
|
|
|||
|
|
@ -178,7 +178,7 @@
|
|||
<dependency>
|
||||
<groupId>org.apache.tomcat.embed</groupId>
|
||||
<artifactId>tomcat-embed-core</artifactId>
|
||||
<version>8.5.15</version>
|
||||
<version>8.5.46</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
@ -188,7 +188,7 @@
|
|||
<dependency>
|
||||
<groupId>io.netty</groupId>
|
||||
<artifactId>netty-buffer</artifactId>
|
||||
<version>4.1.27.Final</version>
|
||||
<version>${netty.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.fusesource.mqtt-client</groupId>
|
||||
|
|
|
|||
|
|
@ -59,6 +59,24 @@
|
|||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
</exclusion>
|
||||
<!--commons-configuration uses commons-lang:commons-lang:2.4
|
||||
while others use commons-lang 2.6-->
|
||||
<exclusion>
|
||||
<groupId>commons-configuration</groupId>
|
||||
<artifactId>commons-configuration</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<!-- this is just used by hadoop-common-->
|
||||
<dependency>
|
||||
<groupId>commons-configuration</groupId>
|
||||
<artifactId>commons-configuration</artifactId>
|
||||
<version>1.6</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>commons-lang</groupId>
|
||||
<artifactId>commons-lang</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<!-- many of hadoop dependencies use guava11, but org.apache.curator from hadoop-common uses
|
||||
|
|
@ -67,6 +85,14 @@
|
|||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
<version>[${guava.version},)</version>
|
||||
<exclusions>
|
||||
<!-- iotdb-server depends on com.github.ben-manes.caffeine:caffeine:2.9.1,
|
||||
which depends on checker-qual 3.10.0 -->
|
||||
<exclusion>
|
||||
<groupId>org.checkerframework</groupId>
|
||||
<artifactId>checker-qual</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
|
|
|
|||
|
|
@ -41,6 +41,12 @@
|
|||
<artifactId>zeppelin-interpreter</artifactId>
|
||||
<version>${zeppelin.version}</version>
|
||||
<scope>provided</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>com.google.errorprone</groupId>
|
||||
<artifactId>error_prone_annotations</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
|
|
|
|||
Loading…
Reference in New Issue