diff --git a/hutool-ai/pom.xml b/hutool-ai/pom.xml index 4388dcb94..33359bbbf 100644 --- a/hutool-ai/pom.xml +++ b/hutool-ai/pom.xml @@ -19,17 +19,17 @@ cn.hutool.v7.ai 1.15.2 - 2.18.1 + 2.19.1 2.0.53 - 2.13.0 + 2.13.1 12.0.19 3.0.2 - 5.4.3 + 5.5 4.5.14 5.0.0-alpha.14 2.3.18.Final - 11.0.6 + 11.0.8 1.4.3 2.0.9 diff --git a/hutool-ai/src/main/java/module-info.java b/hutool-ai/src/main/java/module-info.java deleted file mode 100644 index c0aaee3ec..000000000 --- a/hutool-ai/src/main/java/module-info.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2025 Hutool Team and hutool.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * @author choweli - */ -module hutool.ai { - exports cn.hutool.v7.ai; - exports cn.hutool.v7.ai.core; - exports cn.hutool.v7.ai.model.hutool; - exports cn.hutool.v7.ai.model.deepseek; - exports cn.hutool.v7.ai.model.doubao; - exports cn.hutool.v7.ai.model.grok; - exports cn.hutool.v7.ai.model.openai; - - requires hutool.json; - requires hutool.core; - requires hutool.crypto; - requires hutool.http; - -} diff --git a/hutool-all/src/main/java/module-info.java b/hutool-all/src/main/java/module-info.java deleted file mode 100644 index a8078b0f0..000000000 --- a/hutool-all/src/main/java/module-info.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2025 Hutool Team and hutool.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * @author choweli - */ -module hutool.all { - requires hutool.core; - -} diff --git a/hutool-core/src/main/java/module-info.java b/hutool-core/src/main/java/module-info.java deleted file mode 100644 index 95ac202ff..000000000 --- a/hutool-core/src/main/java/module-info.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (c) 2025 Hutool Team and hutool.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * @author choweli - */ -module hutool.core { - exports cn.hutool.v7.core.exception; - exports cn.hutool.v7.core.lang; - exports cn.hutool.v7.core.lang.wrapper; - exports cn.hutool.v7.core.text; - exports cn.hutool.v7.core.io; - exports cn.hutool.v7.core.io.file; - exports cn.hutool.v7.core.io.stream; - exports cn.hutool.v7.core.io.resource; - exports cn.hutool.v7.core.util; - exports cn.hutool.v7.core.array; - exports cn.hutool.v7.core.codec.binary; - exports cn.hutool.v7.core.thread; - exports cn.hutool.v7.core.thread.lock; - exports cn.hutool.v7.core.map; - exports cn.hutool.v7.core.collection; - exports cn.hutool.v7.core.spi; - exports cn.hutool.v7.core.func; - exports cn.hutool.v7.core.lang.caller; - exports cn.hutool.v7.core.reflect; - exports cn.hutool.v7.core.lang.ansi; - exports cn.hutool.v7.core.date; - exports cn.hutool.v7.core.lang.getter; - exports cn.hutool.v7.core.text.split; - exports cn.hutool.v7.core.bean.copier; - exports cn.hutool.v7.core.bean.path; - exports cn.hutool.v7.core.bean; - exports cn.hutool.v7.core.net.url; - exports cn.hutool.v7.core.io.watch; - exports cn.hutool.v7.core.io.watch.watchers; - exports cn.hutool.v7.core.convert; - exports cn.hutool.v7.core.regex; - exports cn.hutool.v7.core.map.concurrent; - exports cn.hutool.v7.core.math; - exports cn.hutool.v7.core.collection.set; - exports cn.hutool.v7.core.collection.iter; - exports cn.hutool.v7.core.reflect.method; - exports cn.hutool.v7.core.lang.builder; - exports cn.hutool.v7.core.lang.range; - exports cn.hutool.v7.core.lang.page; - exports cn.hutool.v7.core.classloader; - exports cn.hutool.v7.core.pool; - exports cn.hutool.v7.core.pool.partition; - exports cn.hutool.v7.core.stream; - exports cn.hutool.v7.core.lang.tuple; - exports cn.hutool.v7.core.codec; - exports cn.hutool.v7.core.net; - exports cn.hutool.v7.core.map.reference; - exports cn.hutool.v7.core.lang.mutable; - exports cn.hutool.v7.core.lang.loader; - exports cn.hutool.v7.core.comparator; - exports cn.hutool.v7.core.date.format; - exports cn.hutool.v7.core.lang.copier; - exports cn.hutool.v7.core.convert.impl; - exports cn.hutool.v7.core.bean.path.node; - exports cn.hutool.v7.core.xml; - exports cn.hutool.v7.core.reflect.kotlin; - exports cn.hutool.v7.core.text.escape; - exports cn.hutool.v7.core.annotation; - exports cn.hutool.v7.core.map.multi; - exports cn.hutool.v7.core.data.id; - exports cn.hutool.v7.core.io.buffer; - exports cn.hutool.v7.core.reflect.creator; - exports cn.hutool.v7.core.compress; - exports cn.hutool.v7.core.net.ssl; - - requires java.desktop; - requires java.sql; - requires java.management; - requires java.compiler; - requires java.naming; - -} diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue1687Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue1687Test.java index 71a3015f7..ccc07a73e 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue1687Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue1687Test.java @@ -39,7 +39,7 @@ public class Issue1687Test { final SysUser sysUser = BeanUtil.toBean(sysUserFb, SysUser.class); // 别名错位导致找不到字段 Assertions.assertNull(sysUser.getDepart()); - Assertions.assertEquals(new Long(456L), sysUser.getOrgId()); + Assertions.assertEquals(Long.valueOf(456L), sysUser.getOrgId()); } @Test @@ -54,8 +54,8 @@ public class Issue1687Test { ); final SysUser sysUser = BeanUtil.toBean(sysUserFb, SysUser.class, copyOptions); - Assertions.assertEquals(new Long(123L), sysUser.getDepart()); - Assertions.assertEquals(new Long(456L), sysUser.getOrgId()); + Assertions.assertEquals(Long.valueOf(123L), sysUser.getDepart()); + Assertions.assertEquals(Long.valueOf(456L), sysUser.getOrgId()); } @Data diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/collection/MapProxyTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/collection/MapProxyTest.java index f0a223a1f..e793580b6 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/collection/MapProxyTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/collection/MapProxyTest.java @@ -35,7 +35,7 @@ public class MapProxyTest { final MapProxy mapProxy = new MapProxy(map); final Integer b = mapProxy.getInt("b"); - Assertions.assertEquals(new Integer(2), b); + Assertions.assertEquals(Integer.valueOf(2), b); final Set keys = mapProxy.keySet(); Assertions.assertFalse(keys.isEmpty()); diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/convert/CastUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/CastUtilTest.java index f159dbbc9..b33457070 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/convert/CastUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/CastUtilTest.java @@ -38,7 +38,7 @@ public class CastUtilTest { map.put(1, 1); final Collection collection2 = CastUtil.castUp(collection); - collection2.add(new Double("123.1")); + collection2.add(Double.valueOf("123.1")); Assertions.assertSame(collection, collection2); final Collection collection3 = CastUtil.castDown(collection2); diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToArrayTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToArrayTest.java index d1bb33fc7..d782eeb85 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToArrayTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToArrayTest.java @@ -129,11 +129,11 @@ public class ConvertToArrayTest { final Character[] array = ConvertUtil.toCharArray(testStr); //包装类型数组 - Assertions.assertEquals(new Character('a'), array[0]); - Assertions.assertEquals(new Character('b'), array[1]); - Assertions.assertEquals(new Character('c'), array[2]); - Assertions.assertEquals(new Character('d'), array[3]); - Assertions.assertEquals(new Character('e'), array[4]); + Assertions.assertEquals(Character.valueOf('a'), array[0]); + Assertions.assertEquals(Character.valueOf('b'), array[1]); + Assertions.assertEquals(Character.valueOf('c'), array[2]); + Assertions.assertEquals(Character.valueOf('d'), array[3]); + Assertions.assertEquals(Character.valueOf('e'), array[4]); //原始类型数组 final char[] array2 = ConvertUtil.convert(char[].class, testStr); diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/map/RowKeyTableTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/RowKeyTableTest.java index 5caf20d4a..87fe76707 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/map/RowKeyTableTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/RowKeyTableTest.java @@ -31,7 +31,7 @@ public class RowKeyTableTest { table.put(1, 2, 3); table.put(1, 6, 4); - Assertions.assertEquals(new Integer(3), table.get(1, 2)); + Assertions.assertEquals(Integer.valueOf(3), table.get(1, 2)); Assertions.assertNull(table.get(1, 3)); //判断row和column确定的二维点是否存在 diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/map/TableMapTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/TableMapTest.java index 23cfa909a..8a805d498 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/map/TableMapTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/TableMapTest.java @@ -27,8 +27,8 @@ public class TableMapTest { tableMap.put("aaa", 111); tableMap.put("bbb", 222); - Assertions.assertEquals(new Integer(111), tableMap.get("aaa")); - Assertions.assertEquals(new Integer(222), tableMap.get("bbb")); + Assertions.assertEquals(Integer.valueOf(111), tableMap.get("aaa")); + Assertions.assertEquals(Integer.valueOf(222), tableMap.get("bbb")); Assertions.assertEquals("aaa", tableMap.getKey(111)); Assertions.assertEquals("bbb", tableMap.getKey(222)); diff --git a/hutool-cron/pom.xml b/hutool-cron/pom.xml index bef11fd35..0433d17af 100755 --- a/hutool-cron/pom.xml +++ b/hutool-cron/pom.xml @@ -42,7 +42,7 @@ 2.20.0 1.3.6 2.7.0 - 1.3.4 + 1.3.5 diff --git a/hutool-cron/src/main/java/module-info.java b/hutool-cron/src/main/java/module-info.java deleted file mode 100644 index 17fffc929..000000000 --- a/hutool-cron/src/main/java/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2025 Hutool Team and hutool.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * @author choweli - */ -module hutool.cron { - requires hutool.setting; - requires hutool.log; - requires hutool.core; - -} diff --git a/hutool-crypto/src/main/java/module-info.java b/hutool-crypto/src/main/java/module-info.java deleted file mode 100644 index 1a3a69fa7..000000000 --- a/hutool-crypto/src/main/java/module-info.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2025 Hutool Team and hutool.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * @author choweli - */ -module hutool.crypto { - exports cn.hutool.v7.crypto; - exports cn.hutool.v7.crypto.provider; - exports cn.hutool.v7.crypto.digest.mac; - exports cn.hutool.v7.crypto.asymmetric; - - requires hutool.core; - requires org.bouncycastle.provider; - requires java.security.sasl; - requires org.bouncycastle.pkix; - -} diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml index 6bdbd00ec..ac0d7e8b9 100755 --- a/hutool-db/pom.xml +++ b/hutool-db/pom.xml @@ -50,7 +50,7 @@ 2.20.0 1.3.6 2.7.0 - 1.3.4 + 1.3.5 diff --git a/hutool-db/src/main/java/module-info.java b/hutool-db/src/main/java/module-info.java deleted file mode 100644 index e88452b83..000000000 --- a/hutool-db/src/main/java/module-info.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2025 Hutool Team and hutool.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * @author choweli - */ -module hutool.db { - - exports cn.hutool.v7.db; - exports cn.hutool.v7.db.config; - exports cn.hutool.v7.db.handler; - exports cn.hutool.v7.db.dialect; - exports cn.hutool.v7.db.sql; - exports cn.hutool.v7.db.sql.filter; - exports cn.hutool.v7.db.ds; - exports cn.hutool.v7.db.ds.bee; - exports cn.hutool.v7.db.ds.c3p0; - exports cn.hutool.v7.db.ds.dbcp; - exports cn.hutool.v7.db.ds.druid; - exports cn.hutool.v7.db.ds.hikari; - exports cn.hutool.v7.db.ds.jndi; - exports cn.hutool.v7.db.ds.pooled; - exports cn.hutool.v7.db.ds.simple; - exports cn.hutool.v7.db.ds.tomcat; - - requires hutool.setting; - requires hutool.log; - requires hutool.core; - requires beecp; - requires com.mchange.v2.c3p0; - requires java.desktop; - requires org.apache.commons.dbcp2; - requires druid; - requires com.zaxxer.hikari; - requires java.sql; - requires java.naming; - requires tomcat.jdbc; - - opens cn.hutool.v7.db; - opens cn.hutool.v7.db.config; - opens cn.hutool.v7.db.pojo; - -} diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml index 93a1804d6..db3a42e9f 100755 --- a/hutool-extra/pom.xml +++ b/hutool-extra/pom.xml @@ -268,17 +268,7 @@ org.apache.sshd sshd-core ${sshd.version} - - - org.apache.sshd - sshd-common - - - - - org.apache.sshd - sshd-common - ${sshd.version} + true diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/analysis/AnalysisWord.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/analysis/AnalysisWord.java index 646cd9f2a..5f9344a08 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/analysis/AnalysisWord.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/analysis/AnalysisWord.java @@ -22,6 +22,8 @@ import org.apache.lucene.util.Attribute; import cn.hutool.v7.extra.tokenizer.Word; +import java.io.Serial; + /** * Lucene-analysis分词中的一个单词包装 * @@ -29,6 +31,7 @@ import cn.hutool.v7.extra.tokenizer.Word; * */ public class AnalysisWord implements Word { + @Serial private static final long serialVersionUID = 1L; private final Attribute word; diff --git a/hutool-http/pom.xml b/hutool-http/pom.xml index 9519b200b..c95e01e72 100755 --- a/hutool-http/pom.xml +++ b/hutool-http/pom.xml @@ -34,12 +34,12 @@ cn.hutool.v7.http - 5.4.3 + 5.5 4.5.14 5.0.0-alpha.14 2.3.18.Final 12.0.19 - 11.0.6 + 11.0.8 1.4.3 6.1.0 3.0.2 @@ -50,7 +50,7 @@ 2.20.0 1.3.6 2.7.0 - 1.3.4 + 1.3.5 diff --git a/hutool-http/src/main/java/module-info.java b/hutool-http/src/main/java/module-info.java deleted file mode 100644 index 5ef31ff3f..000000000 --- a/hutool-http/src/main/java/module-info.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2025 Hutool Team and hutool.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * @author choweli - */ -module hutool.http { - exports cn.hutool.v7.http.meta; - exports cn.hutool.v7.http.client; - exports cn.hutool.v7.http; - - requires jdk.httpserver; - requires hutool.log; - requires org.apache.httpcomponents.httpclient; - requires org.apache.httpcomponents.httpcore; - requires hutool.core; - requires org.apache.httpcomponents.core5.httpcore5; - requires org.apache.httpcomponents.client5.httpclient5; - requires okhttp3; - requires org.eclipse.jetty.server; - requires smart.http.server; - requires undertow.core; - requires jakarta.xml.soap; - requires okio; - requires smart.http.common; - requires org.apache.tomcat.embed.core; - - requires aio.pro; - - opens cn.hutool.v7.http.client.engine; - opens cn.hutool.v7.http.client.engine.httpclient5; - opens cn.hutool.v7.http.client.engine.httpclient4; - opens cn.hutool.v7.http.client.engine.okhttp; - opens cn.hutool.v7.http.client.engine.jdk; - -} diff --git a/hutool-jmh/src/test/java/module-info.java b/hutool-jmh/src/test/java/module-info.java deleted file mode 100644 index 7dd9e9b7f..000000000 --- a/hutool-jmh/src/test/java/module-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2025 Hutool Team and hutool.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * @author choweli - */ -module hutool.jmh { - -} diff --git a/hutool-json/pom.xml b/hutool-json/pom.xml index fffc9f03c..b20f8dd83 100755 --- a/hutool-json/pom.xml +++ b/hutool-json/pom.xml @@ -36,9 +36,9 @@ cn.hutool.v7.json 0.12.6 - 2.18.1 + 2.19.1 2.0.53 - 2.13.0 + 2.13.1 1.15.2 diff --git a/hutool-json/src/main/java/cn/hutool/v7/json/issues/Test.java b/hutool-json/src/main/java/cn/hutool/v7/json/issues/Test.java deleted file mode 100644 index df336f2e5..000000000 --- a/hutool-json/src/main/java/cn/hutool/v7/json/issues/Test.java +++ /dev/null @@ -1,8 +0,0 @@ -package cn.hutool.v7.json.issues; - -/** - * 为了通过test进行占位 - * @author choweli - */ -public class Test { -} diff --git a/hutool-json/src/main/java/cn/hutool/v7/json/issues/issueIVMD5/Test.java b/hutool-json/src/main/java/cn/hutool/v7/json/issues/issueIVMD5/Test.java deleted file mode 100644 index f83146c6b..000000000 --- a/hutool-json/src/main/java/cn/hutool/v7/json/issues/issueIVMD5/Test.java +++ /dev/null @@ -1,8 +0,0 @@ -package cn.hutool.v7.json.issues.issueIVMD5; - -/** - * 为了通过test进行占位 - * @author choweli - */ -public class Test { -} diff --git a/hutool-json/src/main/java/cn/hutool/v7/json/test/bean/Test.java b/hutool-json/src/main/java/cn/hutool/v7/json/test/bean/Test.java deleted file mode 100644 index 4f56d5d53..000000000 --- a/hutool-json/src/main/java/cn/hutool/v7/json/test/bean/Test.java +++ /dev/null @@ -1,8 +0,0 @@ -package cn.hutool.v7.json.test.bean; - -/** - * 为了通过test进行占位 - * @author choweli - */ -public class Test { -} diff --git a/hutool-json/src/main/java/cn/hutool/v7/json/test/bean/report/Test.java b/hutool-json/src/main/java/cn/hutool/v7/json/test/bean/report/Test.java deleted file mode 100644 index 372698d9f..000000000 --- a/hutool-json/src/main/java/cn/hutool/v7/json/test/bean/report/Test.java +++ /dev/null @@ -1,8 +0,0 @@ -package cn.hutool.v7.json.test.bean.report; - -/** - * 为了通过test进行占位 - * @author choweli - */ -public class Test { -} diff --git a/hutool-json/src/main/java/module-info.java b/hutool-json/src/main/java/module-info.java deleted file mode 100644 index 2364d0855..000000000 --- a/hutool-json/src/main/java/module-info.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2025 Hutool Team and hutool.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * @author choweli - */ -module hutool.json { - exports cn.hutool.v7.json; - exports cn.hutool.v7.json.jwt; - exports cn.hutool.v7.json.writer; - exports cn.hutool.v7.json.engine; - exports cn.hutool.v7.json.engine.gson; - exports cn.hutool.v7.json.engine.moshi; - exports cn.hutool.v7.json.engine.jackson; - exports cn.hutool.v7.json.engine.fastjson; - exports cn.hutool.v7.json.test.bean; - exports cn.hutool.v7.json.test.bean.report; - - requires hutool.core; - requires hutool.crypto; - requires com.alibaba.fastjson2; - requires com.google.gson; - requires com.fasterxml.jackson.databind; - requires com.squareup.moshi; - requires okio; - requires java.sql; - - opens cn.hutool.v7.json; - opens cn.hutool.v7.json.jwt; - opens cn.hutool.v7.json.engine; - opens cn.hutool.v7.json.issues; - opens cn.hutool.v7.json.issues.issueIVMD5; - -} diff --git a/hutool-log/src/main/java/module-info.java b/hutool-log/src/main/java/module-info.java deleted file mode 100644 index 90c863e10..000000000 --- a/hutool-log/src/main/java/module-info.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2025 Hutool Team and hutool.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * @author choweli - */ -module hutool.log { - exports cn.hutool.v7.log; - exports cn.hutool.v7.log.level; - exports cn.hutool.v7.log.engine.console; - exports cn.hutool.v7.log.engine.log4j2; - - requires hutool.core; - requires org.jboss.logging; - requires org.apache.commons.logging; - requires org.apache.logging.log4j; - requires org.slf4j; - requires tinylog; - requires org.tinylog.api; - requires java.logging; - requires log4j; - -} diff --git a/hutool-poi/src/main/java/module-info.java b/hutool-poi/src/main/java/module-info.java deleted file mode 100644 index bfdcfd4ec..000000000 --- a/hutool-poi/src/main/java/module-info.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2025 Hutool Team and hutool.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * @author choweli - */ -module hutool.poi { - exports cn.hutool.v7.poi.excel.reader; - - requires org.apache.poi.ooxml; - requires hutool.core; - requires java.desktop; - requires ofdrw.layout; - requires ofdrw.font; - requires ofdrw.reader; - requires ofdrw.converter; - requires java.sql; - - opens cn.hutool.v7.poi.excel.writer; - opens cn.hutool.v7.poi.csv; - -} diff --git a/hutool-setting/src/main/java/module-info.java b/hutool-setting/src/main/java/module-info.java deleted file mode 100644 index 3e581cc9f..000000000 --- a/hutool-setting/src/main/java/module-info.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2025 Hutool Team and hutool.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * @author choweli - */ -module hutool.setting { - exports cn.hutool.v7.setting; - exports cn.hutool.v7.setting.props; - - requires hutool.log; - requires hutool.core; - requires org.yaml.snakeyaml; - - opens cn.hutool.v7.setting.toml; - -} diff --git a/hutool-socket/pom.xml b/hutool-socket/pom.xml index bba253c17..c210a9195 100755 --- a/hutool-socket/pom.xml +++ b/hutool-socket/pom.xml @@ -41,7 +41,7 @@ 2.20.0 1.3.6 2.7.0 - 1.3.4 + 1.3.5 diff --git a/hutool-socket/src/main/java/module-info.java b/hutool-socket/src/main/java/module-info.java deleted file mode 100644 index 301daffc5..000000000 --- a/hutool-socket/src/main/java/module-info.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2025 Hutool Team and hutool.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * @author choweli - */ -module hutool.socket { - requires hutool.log; - requires hutool.core; -} diff --git a/hutool-swing/src/main/java/module-info.java b/hutool-swing/src/main/java/module-info.java deleted file mode 100644 index b32fc4c2b..000000000 --- a/hutool-swing/src/main/java/module-info.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2025 Hutool Team and hutool.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * @author choweli - */ -module hutool.swing { - requires hutool.core; - requires java.desktop; - requires animated.gif.lib; - requires metadata.extractor; - requires com.google.zxing; - -} diff --git a/pom.xml b/pom.xml index 8689ca818..e5f8d1834 100755 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 17 - 5.12.2 + 5.13.1 1.18.38 2.1.20 1.80