Change groupId and java package prefix to "org.apache.bifromq" (#137)

Author: popduke

README.md

@@ -120,7 +120,7 @@ Clone the repository to your local workspace:
 
 ```
 cd <YOUR_WORKSPACE>
-git clone https://github.com/baidu/bifromq bifromq
+git clone https://github.com/apache/bifromq bifromq
 ```
 
 Navigate to the project root folder and execute the following commands to build the entire project:
@@ -179,7 +179,7 @@ To jump start your BifroMQ plugin development, execute the following Maven comma
 
 ```
 mvn archetype:generate \
-    -DarchetypeGroupId=com.baidu.bifromq \
+    -DarchetypeGroupId=org.apache.bifromq \
     -DarchetypeArtifactId=bifromq-plugin-archetype \
     -DarchetypeVersion=<BIFROMQ_VERSION> \
     -DgroupId=<YOUR_GROUP_ID> \
@@ -220,17 +220,12 @@ support.
 
 ## Discussion
 
-Join our Discord or WeChat group if you are interested in our work.
+Join our Discord if you are interested in our work.
 
 ### Discord
 
 <a href="https://discord.gg/Pfs3QRadRB"><img src="https://img.shields.io/discord/1115542029531885599?logo=discord&logoColor=white" alt="BifroMQ Discord server" /></a>
 
-### WeChat group
-
-[Email](mailto:[email protected]) us your WeChat ID, along with more information on why BifroMQ has caught your
-attention (we'd love to hear about it), and we will invite you to join our group as soon as possible.
-
 ## ASF Incubator disclaimer
 
 Apache BifroMQ&trade; is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.

README.zh_Hans.md

@@ -112,7 +112,7 @@ docker compose up -d
 
 ```
 cd <YOUR_WORKSPACE>
-git clone https://github.com/baidu/bifromq bifromq
+git clone https://github.com/apache/bifromq bifromq
 ```
 
 进入项目文件夹，执行以下命令来构建整个项目：
@@ -171,7 +171,7 @@ mvn test
 
 ```bash
 mvn archetype:generate \
-    -DarchetypeGroupId=com.baidu.bifromq \
+    -DarchetypeGroupId=org.apache.bifromq \
     -DarchetypeArtifactId=bifromq-plugin-archetype \
     -DarchetypeVersion=<BIFROMQ_VERSION> \
     -DgroupId=<YOUR_GROUP_ID> \

base-cluster/pom.xml

@@ -11,33 +11,33 @@
   ~ See the License for the specific language governing permissions and limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>bifromq-parent</artifactId>
-        <groupId>com.baidu.bifromq</groupId>
+        <groupId>org.apache.bifromq</groupId>
         <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>base-cluster</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>com.baidu.bifromq</groupId>
+            <groupId>org.apache.bifromq</groupId>
             <artifactId>base-env-provider</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.baidu.bifromq</groupId>
+            <groupId>org.apache.bifromq</groupId>
             <artifactId>base-hlc</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-core</artifactId>
+            <groupId>org.apache.bifromq</groupId>
+            <artifactId>base-crdt-store</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.baidu.bifromq</groupId>
-            <artifactId>base-crdt-store</artifactId>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-core</artifactId>
         </dependency>
         <dependency>
             <groupId>com.google.protobuf</groupId>

base-cluster/src/main/java/com/baidu/bifromq/basecluster/AgentHost.java renamed to base-cluster/src/main/java/org/apache/bifromq/basecluster/AgentHost.java

@@ -11,32 +11,32 @@
  * See the License for the specific language governing permissions and limitations under the License.
  */
 
-package com.baidu.bifromq.basecluster;
+package org.apache.bifromq.basecluster;
 
-import static com.baidu.bifromq.basecluster.memberlist.CRDTUtil.AGENT_HOST_MAP_URI;
+import static org.apache.bifromq.basecluster.memberlist.CRDTUtil.AGENT_HOST_MAP_URI;
 import static com.google.common.base.Preconditions.checkArgument;
 
-import com.baidu.bifromq.basecluster.agent.proto.AgentEndpoint;
-import com.baidu.bifromq.basecluster.fd.FailureDetector;
-import com.baidu.bifromq.basecluster.fd.IFailureDetector;
-import com.baidu.bifromq.basecluster.fd.IProbingTarget;
-import com.baidu.bifromq.basecluster.memberlist.AutoDropper;
-import com.baidu.bifromq.basecluster.memberlist.AutoHealer;
-import com.baidu.bifromq.basecluster.memberlist.AutoSeeder;
-import com.baidu.bifromq.basecluster.memberlist.HostMemberList;
-import com.baidu.bifromq.basecluster.memberlist.IHostAddressResolver;
-import com.baidu.bifromq.basecluster.memberlist.IHostMemberList;
-import com.baidu.bifromq.basecluster.memberlist.MemberSelector;
-import com.baidu.bifromq.basecluster.memberlist.agent.IAgent;
-import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint;
-import com.baidu.bifromq.basecluster.messenger.IMessenger;
-import com.baidu.bifromq.basecluster.messenger.Messenger;
-import com.baidu.bifromq.basecluster.messenger.MessengerOptions;
-import com.baidu.bifromq.basecluster.proto.ClusterMessage;
-import com.baidu.bifromq.basecluster.transport.ITransport;
-import com.baidu.bifromq.basecrdt.store.ICRDTStore;
-import com.baidu.bifromq.basecrdt.store.proto.CRDTStoreMessage;
-import com.baidu.bifromq.baseenv.EnvProvider;
+import org.apache.bifromq.basecluster.agent.proto.AgentEndpoint;
+import org.apache.bifromq.basecluster.fd.FailureDetector;
+import org.apache.bifromq.basecluster.fd.IFailureDetector;
+import org.apache.bifromq.basecluster.fd.IProbingTarget;
+import org.apache.bifromq.basecluster.memberlist.AutoDropper;
+import org.apache.bifromq.basecluster.memberlist.AutoHealer;
+import org.apache.bifromq.basecluster.memberlist.AutoSeeder;
+import org.apache.bifromq.basecluster.memberlist.HostMemberList;
+import org.apache.bifromq.basecluster.memberlist.IHostAddressResolver;
+import org.apache.bifromq.basecluster.memberlist.IHostMemberList;
+import org.apache.bifromq.basecluster.memberlist.MemberSelector;
+import org.apache.bifromq.basecluster.memberlist.agent.IAgent;
+import org.apache.bifromq.basecluster.membership.proto.HostEndpoint;
+import org.apache.bifromq.basecluster.messenger.IMessenger;
+import org.apache.bifromq.basecluster.messenger.Messenger;
+import org.apache.bifromq.basecluster.messenger.MessengerOptions;
+import org.apache.bifromq.basecluster.proto.ClusterMessage;
+import org.apache.bifromq.basecluster.transport.ITransport;
+import org.apache.bifromq.basecrdt.store.ICRDTStore;
+import org.apache.bifromq.basecrdt.store.proto.CRDTStoreMessage;
+import org.apache.bifromq.baseenv.EnvProvider;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.protobuf.ByteString;

base-cluster/src/main/java/com/baidu/bifromq/basecluster/AgentHostOptions.java renamed to base-cluster/src/main/java/org/apache/bifromq/basecluster/AgentHostOptions.java

@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and limitations under the License.
  */
 
-package com.baidu.bifromq.basecluster;
+package org.apache.bifromq.basecluster;
 
-import com.baidu.bifromq.basecrdt.store.CRDTStoreOptions;
+import org.apache.bifromq.basecrdt.store.CRDTStoreOptions;
 import io.netty.handler.ssl.SslContext;
 import java.time.Duration;
 import lombok.AccessLevel;

base-cluster/src/main/java/com/baidu/bifromq/basecluster/IAgentHost.java renamed to base-cluster/src/main/java/org/apache/bifromq/basecluster/IAgentHost.java

@@ -11,15 +11,15 @@
  * See the License for the specific language governing permissions and limitations under the License.
  */
 
-package com.baidu.bifromq.basecluster;
+package org.apache.bifromq.basecluster;
 
-import com.baidu.bifromq.basecluster.memberlist.HostAddressResolver;
-import com.baidu.bifromq.basecluster.memberlist.IHostAddressResolver;
-import com.baidu.bifromq.basecluster.memberlist.agent.IAgent;
-import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint;
-import com.baidu.bifromq.basecluster.transport.ITransport;
-import com.baidu.bifromq.basecluster.transport.TCPTransport;
-import com.baidu.bifromq.basecluster.transport.Transport;
+import org.apache.bifromq.basecluster.memberlist.HostAddressResolver;
+import org.apache.bifromq.basecluster.memberlist.IHostAddressResolver;
+import org.apache.bifromq.basecluster.memberlist.agent.IAgent;
+import org.apache.bifromq.basecluster.membership.proto.HostEndpoint;
+import org.apache.bifromq.basecluster.transport.ITransport;
+import org.apache.bifromq.basecluster.transport.TCPTransport;
+import org.apache.bifromq.basecluster.transport.Transport;
 import io.reactivex.rxjava3.core.Observable;
 import java.net.InetSocketAddress;
 import java.util.Map;

base-cluster/src/main/java/com/baidu/bifromq/basecluster/fd/DirectProbingInfo.java renamed to base-cluster/src/main/java/org/apache/bifromq/basecluster/fd/DirectProbingInfo.java

@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and limitations under the License.
  */
 
-package com.baidu.bifromq.basecluster.fd;
+package org.apache.bifromq.basecluster.fd;
 
-import com.baidu.bifromq.basecluster.proto.ClusterMessage;
+import org.apache.bifromq.basecluster.proto.ClusterMessage;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;

base-cluster/src/main/java/com/baidu/bifromq/basecluster/fd/FailureDetector.java renamed to base-cluster/src/main/java/org/apache/bifromq/basecluster/fd/FailureDetector.java

@@ -11,15 +11,15 @@
  * See the License for the specific language governing permissions and limitations under the License.
  */
 
-package com.baidu.bifromq.basecluster.fd;
+package org.apache.bifromq.basecluster.fd;
 
-import com.baidu.bifromq.basecluster.fd.proto.Ack;
-import com.baidu.bifromq.basecluster.fd.proto.Nack;
-import com.baidu.bifromq.basecluster.fd.proto.Ping;
-import com.baidu.bifromq.basecluster.fd.proto.PingReq;
-import com.baidu.bifromq.basecluster.messenger.IMessenger;
-import com.baidu.bifromq.basecluster.messenger.MessageEnvelope;
-import com.baidu.bifromq.basecluster.proto.ClusterMessage;
+import org.apache.bifromq.basecluster.fd.proto.Ack;
+import org.apache.bifromq.basecluster.fd.proto.Nack;
+import org.apache.bifromq.basecluster.fd.proto.Ping;
+import org.apache.bifromq.basecluster.fd.proto.PingReq;
+import org.apache.bifromq.basecluster.messenger.IMessenger;
+import org.apache.bifromq.basecluster.messenger.MessageEnvelope;
+import org.apache.bifromq.basecluster.proto.ClusterMessage;
 import com.google.common.base.Preconditions;
 import com.google.common.primitives.Ints;
 import io.reactivex.rxjava3.annotations.NonNull;

base-cluster/src/main/java/com/baidu/bifromq/basecluster/fd/FailureDetectorMath.java renamed to base-cluster/src/main/java/org/apache/bifromq/basecluster/fd/FailureDetectorMath.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and limitations under the License.
  */
 
-package com.baidu.bifromq.basecluster.fd;
+package org.apache.bifromq.basecluster.fd;
 
 import java.time.Duration;
 

base-cluster/src/main/java/com/baidu/bifromq/basecluster/fd/IFailureDetector.java renamed to base-cluster/src/main/java/org/apache/bifromq/basecluster/fd/IFailureDetector.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and limitations under the License.
  */
 
-package com.baidu.bifromq.basecluster.fd;
+package org.apache.bifromq.basecluster.fd;
 
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.schedulers.Timed;

base-cluster/src/main/java/com/baidu/bifromq/basecluster/fd/IProbingTarget.java renamed to base-cluster/src/main/java/org/apache/bifromq/basecluster/fd/IProbingTarget.java

@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and limitations under the License.
  */
 
-package com.baidu.bifromq.basecluster.fd;
+package org.apache.bifromq.basecluster.fd;
 
-import com.baidu.bifromq.basecluster.messenger.IRecipient;
+import org.apache.bifromq.basecluster.messenger.IRecipient;
 import com.google.protobuf.ByteString;
 
 public interface IProbingTarget extends IRecipient {

base-cluster/src/main/java/com/baidu/bifromq/basecluster/fd/IProbingTargetSelector.java renamed to base-cluster/src/main/java/org/apache/bifromq/basecluster/fd/IProbingTargetSelector.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and limitations under the License.
  */
 
-package com.baidu.bifromq.basecluster.fd;
+package org.apache.bifromq.basecluster.fd;
 
 import java.util.Collection;
 

base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/AutoDropper.java renamed to base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/AutoDropper.java

@@ -11,21 +11,21 @@
  * See the License for the specific language governing permissions and limitations under the License.
  */
 
-package com.baidu.bifromq.basecluster.memberlist;
-
-import com.baidu.bifromq.basecluster.fd.DirectProbingInfo;
-import com.baidu.bifromq.basecluster.fd.IFailureDetector;
-import com.baidu.bifromq.basecluster.fd.IProbingTarget;
-import com.baidu.bifromq.basecluster.fd.IProbingTargetSelector;
-import com.baidu.bifromq.basecluster.membership.proto.Doubt;
-import com.baidu.bifromq.basecluster.membership.proto.Endorse;
-import com.baidu.bifromq.basecluster.membership.proto.Fail;
-import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint;
-import com.baidu.bifromq.basecluster.membership.proto.HostMember;
-import com.baidu.bifromq.basecluster.membership.proto.Join;
-import com.baidu.bifromq.basecluster.membership.proto.Quit;
-import com.baidu.bifromq.basecluster.messenger.IMessenger;
-import com.baidu.bifromq.basecluster.proto.ClusterMessage;
+package org.apache.bifromq.basecluster.memberlist;
+
+import org.apache.bifromq.basecluster.fd.DirectProbingInfo;
+import org.apache.bifromq.basecluster.fd.IFailureDetector;
+import org.apache.bifromq.basecluster.fd.IProbingTarget;
+import org.apache.bifromq.basecluster.fd.IProbingTargetSelector;
+import org.apache.bifromq.basecluster.membership.proto.Doubt;
+import org.apache.bifromq.basecluster.membership.proto.Endorse;
+import org.apache.bifromq.basecluster.membership.proto.Fail;
+import org.apache.bifromq.basecluster.membership.proto.HostEndpoint;
+import org.apache.bifromq.basecluster.membership.proto.HostMember;
+import org.apache.bifromq.basecluster.membership.proto.Join;
+import org.apache.bifromq.basecluster.membership.proto.Quit;
+import org.apache.bifromq.basecluster.messenger.IMessenger;
+import org.apache.bifromq.basecluster.proto.ClusterMessage;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.protobuf.ByteString;

base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/AutoHealer.java renamed to base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/AutoHealer.java

@@ -11,18 +11,18 @@
  * See the License for the specific language governing permissions and limitations under the License.
  */
 
-package com.baidu.bifromq.basecluster.memberlist;
+package org.apache.bifromq.basecluster.memberlist;
 
 import static com.github.benmanes.caffeine.cache.Scheduler.systemScheduler;
 
-import com.baidu.bifromq.basecluster.membership.proto.Endorse;
-import com.baidu.bifromq.basecluster.membership.proto.Fail;
-import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint;
-import com.baidu.bifromq.basecluster.membership.proto.HostMember;
-import com.baidu.bifromq.basecluster.membership.proto.Join;
-import com.baidu.bifromq.basecluster.membership.proto.Quit;
-import com.baidu.bifromq.basecluster.messenger.IMessenger;
-import com.baidu.bifromq.basecluster.proto.ClusterMessage;
+import org.apache.bifromq.basecluster.membership.proto.Endorse;
+import org.apache.bifromq.basecluster.membership.proto.Fail;
+import org.apache.bifromq.basecluster.membership.proto.HostEndpoint;
+import org.apache.bifromq.basecluster.membership.proto.HostMember;
+import org.apache.bifromq.basecluster.membership.proto.Join;
+import org.apache.bifromq.basecluster.membership.proto.Quit;
+import org.apache.bifromq.basecluster.messenger.IMessenger;
+import org.apache.bifromq.basecluster.proto.ClusterMessage;
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.RemovalListener;

base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/AutoSeeder.java renamed to base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/AutoSeeder.java

@@ -11,12 +11,12 @@
  * See the License for the specific language governing permissions and limitations under the License.
  */
 
-package com.baidu.bifromq.basecluster.memberlist;
+package org.apache.bifromq.basecluster.memberlist;
 
-import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint;
-import com.baidu.bifromq.basecluster.membership.proto.Join;
-import com.baidu.bifromq.basecluster.messenger.IMessenger;
-import com.baidu.bifromq.basecluster.proto.ClusterMessage;
+import org.apache.bifromq.basecluster.membership.proto.HostEndpoint;
+import org.apache.bifromq.basecluster.membership.proto.Join;
+import org.apache.bifromq.basecluster.messenger.IMessenger;
+import org.apache.bifromq.basecluster.proto.ClusterMessage;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.github.benmanes.caffeine.cache.RemovalListener;

base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/CRDTUtil.java renamed to base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/CRDTUtil.java

@@ -11,15 +11,15 @@
  * See the License for the specific language governing permissions and limitations under the License.
  */
 
-package com.baidu.bifromq.basecluster.memberlist;
+package org.apache.bifromq.basecluster.memberlist;
 
-import static com.baidu.bifromq.basecrdt.core.api.CRDTURI.toURI;
-import static com.baidu.bifromq.basecrdt.core.api.CausalCRDTType.ormap;
+import static org.apache.bifromq.basecrdt.core.api.CRDTURI.toURI;
+import static org.apache.bifromq.basecrdt.core.api.CausalCRDTType.ormap;
 
-import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint;
-import com.baidu.bifromq.basecluster.membership.proto.HostMember;
-import com.baidu.bifromq.basecrdt.core.api.IMVReg;
-import com.baidu.bifromq.basecrdt.core.api.IORMap;
+import org.apache.bifromq.basecluster.membership.proto.HostEndpoint;
+import org.apache.bifromq.basecluster.membership.proto.HostMember;
+import org.apache.bifromq.basecrdt.core.api.IMVReg;
+import org.apache.bifromq.basecrdt.core.api.IORMap;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
 import com.google.protobuf.InvalidProtocolBufferException;

base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/HostAddressResolver.java renamed to base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/HostAddressResolver.java

@@ -11,11 +11,11 @@
  * See the License for the specific language governing permissions and limitations under the License.
  */
 
-package com.baidu.bifromq.basecluster.memberlist;
+package org.apache.bifromq.basecluster.memberlist;
 
 import static com.github.benmanes.caffeine.cache.Scheduler.systemScheduler;
 
-import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint;
+import org.apache.bifromq.basecluster.membership.proto.HostEndpoint;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.Expiry;
 import com.github.benmanes.caffeine.cache.LoadingCache;