diff --git a/README.md b/README.md
index ca43619fe..3fd2ce2d0 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,8 @@
-
-
+
+
@@ -18,14 +18,14 @@
-
-
+
+
-
+
-
-
+
+
@@ -34,7 +34,7 @@
-
+
@@ -79,12 +79,12 @@
Hutool目前主要版本4.x、5.x、6.x、7.x,选择如下:
-| 版本 | jdk | Maven仓库 | 主要特点 |
-|-----|--------|--------------------------------------------------------------------------------------------------------|-------------------------------------|
-| 4.x | jdk1.7 | [cn.hutool/hutool-all/4.x](https://mvnrepository.com/artifact/cn.hutool/hutool-all/4.6.17) | jdk1.7编译 |
-| 5.x | jdk1.8 | [cn.hutool/hutool-all/5.x ](https://mvnrepository.com/artifact/cn.hutool/hutool-all) | jdk1.8编译,使用JavaEE,适配JDK11、17、21 |
+| 版本 | jdk | Maven仓库 | 主要特点 |
+|-----|--------|-----------------------------------------------------------------------------------------------------|-------------------------------------|
+| 4.x | jdk1.7 | [cn.hutool/hutool-all/4.x](https://mvnrepository.com/artifact/cn.hutool/hutool-all/4.6.17) | jdk1.7编译 |
+| 5.x | jdk1.8 | [cn.hutool/hutool-all/5.x ](https://mvnrepository.com/artifact/cn.hutool/hutool-all) | jdk1.8编译,使用JavaEE,适配JDK11、17、21 |
| 6.x | jdk1.8 | [org.dromara.hutool/hutool-all/6.x ](https://mvnrepository.com/artifact/org.dromara.hutool/hutool-all) | jdk1.8编译,使用Jakarta EE,适配JDK11、17、21 |
-| 7.x | jdk17 | [cn.hutool.v7/hutool-all/6.x ](https://mvnrepository.com/artifact/org.dromara.hutool/hutool-all) | jdk17编译,使用Jakarta EE,适配JDK11、17、21 |
+| 7.x | jdk17 | [cn.hutool/hutool-all/6.x ](https://mvnrepository.com/artifact/org.dromara.hutool/hutool-all) | jdk17编译,使用Jakarta EE,适配17+ |
## 🛠️包含组件
diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/annotation/AnnotationProxy.java b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/AnnotationProxy.java
index 38c5b0a90..9024b0807 100644
--- a/hutool-core/src/main/java/cn/hutool/v7/core/annotation/AnnotationProxy.java
+++ b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/AnnotationProxy.java
@@ -19,6 +19,7 @@ package cn.hutool.v7.core.annotation;
import cn.hutool.v7.core.reflect.method.MethodUtil;
import cn.hutool.v7.core.text.StrUtil;
+import java.io.Serial;
import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationHandler;
diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/stream/AbstractEnhancedWrappedStreamTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/stream/AbstractEnhancedWrappedStreamTest.java
index ba1a08743..d06d8a8bf 100644
--- a/hutool-core/src/test/java/cn/hutool/v7/core/stream/AbstractEnhancedWrappedStreamTest.java
+++ b/hutool-core/src/test/java/cn/hutool/v7/core/stream/AbstractEnhancedWrappedStreamTest.java
@@ -100,13 +100,13 @@ public class AbstractEnhancedWrappedStreamTest {
@Test
public void testToZip() {
final List orders = asList(1, 2, 3);
- final List list = asList("dromara", "hutool", "sweet");
+ final List list = asList("bugotech", "hutool", "sweet");
final Map toZip = wrap(orders).toZip(list);
Assertions.assertEquals(new HashMap() {
private static final long serialVersionUID = 1L;
{
- put(1, "dromara");
+ put(1, "bugotech");
put(2, "hutool");
put(3, "sweet");
}
diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/tree/BeanTreeTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/tree/BeanTreeTest.java
index 00d9f4ef9..5f033a658 100644
--- a/hutool-core/src/test/java/cn/hutool/v7/core/tree/BeanTreeTest.java
+++ b/hutool-core/src/test/java/cn/hutool/v7/core/tree/BeanTreeTest.java
@@ -63,28 +63,28 @@ public class BeanTreeTest {
public void setUp() {
originJavaBeanList = EasyStream
.of(
- JavaBean.builder().id(1L).name("dromara").matchParent(true).build(),
- JavaBean.builder().id(2L).name("baomidou").matchParent(true).build(),
+ JavaBean.builder().id(1L).name("bugotech").matchParent(true).build(),
+ JavaBean.builder().id(2L).name("abcde").matchParent(true).build(),
JavaBean.builder().id(3L).name("hutool").parentId(1L).build(),
- JavaBean.builder().id(4L).name("sa-token").parentId(1L).build(),
- JavaBean.builder().id(5L).name("mybatis-plus").parentId(2L).build(),
+ JavaBean.builder().id(4L).name("sasa").parentId(1L).build(),
+ JavaBean.builder().id(5L).name("cde").parentId(2L).build(),
JavaBean.builder().id(6L).name("Looly").parentId(3L).build(),
JavaBean.builder().id(7L).name("click33").parentId(4L).build(),
JavaBean.builder().id(8L).name("jobob").parentId(5L).build()
).toList();
originJavaBeanTree = asList(
- JavaBean.builder().id(1L).name("dromara").matchParent(true)
+ JavaBean.builder().id(1L).name("bugotech").matchParent(true)
.children(asList(
JavaBean.builder().id(3L).name("hutool").parentId(1L)
.children(singletonList(JavaBean.builder().id(6L).name("Looly").parentId(3L).build()))
.build(),
- JavaBean.builder().id(4L).name("sa-token").parentId(1L)
+ JavaBean.builder().id(4L).name("sasa").parentId(1L)
.children(singletonList(JavaBean.builder().id(7L).name("click33").parentId(4L).build()))
.build()))
.build(),
- JavaBean.builder().id(2L).name("baomidou").matchParent(true)
+ JavaBean.builder().id(2L).name("abcde").matchParent(true)
.children(singletonList(
- JavaBean.builder().id(5L).name("mybatis-plus").parentId(2L)
+ JavaBean.builder().id(5L).name("cde").parentId(2L)
.children(singletonList(
JavaBean.builder().id(8L).name("jobob").parentId(5L).build()
))
@@ -113,7 +113,7 @@ public class BeanTreeTest {
public void testFilter() {
final List javaBeanTree = beanTree.filter(originJavaBeanTree, s -> "Looly".equals(s.getName()));
Assertions.assertEquals(singletonList(
- JavaBean.builder().id(1L).name("dromara").matchParent(true)
+ JavaBean.builder().id(1L).name("bugotech").matchParent(true)
.children(singletonList(JavaBean.builder().id(3L).name("hutool").parentId(1L)
.children(singletonList(JavaBean.builder().id(6L).name("Looly").parentId(3L).build()))
.build()))
@@ -125,17 +125,17 @@ public class BeanTreeTest {
public void testForeach() {
final List javaBeanList = beanTree.forEach(originJavaBeanTree, s -> s.setName("【open source】" + s.getName()));
Assertions.assertEquals(asList(
- JavaBean.builder().id(1L).name("【open source】dromara").matchParent(true)
+ JavaBean.builder().id(1L).name("【open source】bugotech").matchParent(true)
.children(asList(JavaBean.builder().id(3L).name("【open source】hutool").parentId(1L)
.children(singletonList(JavaBean.builder().id(6L).name("【open source】Looly").parentId(3L).build()))
.build(),
- JavaBean.builder().id(4L).name("【open source】sa-token").parentId(1L)
+ JavaBean.builder().id(4L).name("【open source】sasa").parentId(1L)
.children(singletonList(JavaBean.builder().id(7L).name("【open source】click33").parentId(4L).build()))
.build()))
.build(),
- JavaBean.builder().id(2L).name("【open source】baomidou").matchParent(true)
+ JavaBean.builder().id(2L).name("【open source】abcde").matchParent(true)
.children(singletonList(
- JavaBean.builder().id(5L).name("【open source】mybatis-plus").parentId(2L)
+ JavaBean.builder().id(5L).name("【open source】cde").parentId(2L)
.children(singletonList(
JavaBean.builder().id(8L).name("【open source】jobob").parentId(5L).build()
))
diff --git a/hutool-extra/src/main/resources/META-INF/services/cn.hutool.v7.extra.template.engine.TemplateEngine b/hutool-extra/src/main/resources/META-INF/services/cn.hutool.v7.extra.template.engine.TemplateEngine
index 59212a168..fcfe07aa3 100644
--- a/hutool-extra/src/main/resources/META-INF/services/cn.hutool.v7.extra.template.engine.TemplateEngine
+++ b/hutool-extra/src/main/resources/META-INF/services/cn.hutool.v7.extra.template.engine.TemplateEngine
@@ -14,7 +14,7 @@
# limitations under the License.
#
-# 实现:org.dromara.hutool.extra.template.engine.TemplateEngine
+# 实现:cn.hutool.v7.extra.template.engine.TemplateEngine
cn.hutool.v7.extra.template.engine.beetl.BeetlEngine
cn.hutool.v7.extra.template.engine.freemarker.FreemarkerEngine
diff --git a/pom.xml b/pom.xml
index fe5a1f720..203a0f0a0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -120,26 +120,6 @@
CherryRum
yulin.1996@foxmail.com
-
- Emptypoint
- 1215582715@qq.com
-
-
- Createsequence
- cn.createsequence@gmail.com
-
-
- TianPeiRong
- canghaihongxin@163.com
-
-
- Dazer007
- dazer007@163.com
-
-
- Aihuahua
- aihuahua522@qq.com
-