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 2021/06/04 17:35:24 UTC

[iotdb] branch issue3132 created (now 0ea25ca)

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

hxd pushed a change to branch issue3132
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


      at 0ea25ca  modify pom to avoid download moquette-broker from Bintary

This branch includes the following new commits:

     new 0ea25ca  modify pom to avoid download moquette-broker from Bintary

The 1 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/01: modify pom to avoid download moquette-broker from Bintary

Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

hxd pushed a commit to branch issue3132
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 0ea25cae8f9802665ddc3cb1c9c376bddcfaaa64
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sat Jun 5 01:33:04 2021 +0800

    modify pom to avoid download moquette-broker from Bintary
---
 LICENSE-binary       |  2 +-
 cluster/pom.xml      | 13 -------------
 distribution/pom.xml | 13 -------------
 iotdb-client-go      |  1 +
 server/pom.xml       | 31 ++-----------------------------
 5 files changed, 4 insertions(+), 56 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index 62da367..2daecb4 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -250,7 +250,7 @@ io.dropwizard.metrics:metrics-core:3.2.6
 io.dropwizard.metrics:metrics-json:3.2.6
 io.dropwizard.metrics:metrics-jvm:3.2.6
 com.librato.metrics:metrics-librato:5.1.0
-io.moquette:moquette-broker:0.13
+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
diff --git a/cluster/pom.xml b/cluster/pom.xml
index 8ea4fa1..31b586f 100644
--- a/cluster/pom.xml
+++ b/cluster/pom.xml
@@ -34,19 +34,6 @@
         <cluster.it.skip>${cluster.test.skip}</cluster.it.skip>
         <cluster.ut.skip>${cluster.test.skip}</cluster.ut.skip>
     </properties>
-    <repositories>
-        <!--   repository for moquette    -->
-        <repository>
-            <id>bintray</id>
-            <url>https://jcenter.bintray.com</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
     <dependencies>
         <!-- The version of thrift is overridden because using 0.13.0 in the cluster module
         will cause unclear bugs -->
diff --git a/distribution/pom.xml b/distribution/pom.xml
index e4e72f9..6f8cc90 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -96,19 +96,6 @@
             </plugin>
         </plugins>
     </build>
-    <repositories>
-        <!--   repository for moquette    -->
-        <repository>
-            <id>bintray</id>
-            <url>https://jcenter.bintray.com</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>org.apache.iotdb</groupId>
diff --git a/iotdb-client-go b/iotdb-client-go
new file mode 160000
index 0000000..3c3ba05
--- /dev/null
+++ b/iotdb-client-go
@@ -0,0 +1 @@
+Subproject commit 3c3ba05bd53106c271b3b99638539d6ed92dd713
diff --git a/server/pom.xml b/server/pom.xml
index e75a1a6..1601e11 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -34,19 +34,6 @@
         <iotdb.it.skip>${iotdb.test.skip}</iotdb.it.skip>
         <iotdb.ut.skip>${iotdb.test.skip}</iotdb.ut.skip>
     </properties>
-    <repositories>
-        <!--   repository for moquette    -->
-        <repository>
-            <id>bintray</id>
-            <url>https://jcenter.bintray.com</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>org.apache.iotdb</groupId>
@@ -123,23 +110,9 @@
             <artifactId>commons-cli</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.moquette</groupId>
+            <groupId>de.fraunhofer.iosb.io.moquette</groupId>
             <artifactId>moquette-broker</artifactId>
-            <version>0.13</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.zaxxer</groupId>
-                    <artifactId>HikariCP</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>0.14.3</version>
         </dependency>
         <!-- for mocked test-->
         <dependency>