From 8bc8c31009c6bf1e734fb1d3ed8ef64bf2c35c85 Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Tue, 30 Apr 2024 09:53:32 -0400 Subject: [PATCH 1/3] Update and send to main package --- .../core-java-collections-list-3/README.md | 14 ----- .../core-java-collections-list-3/pom.xml | 57 ------------------- .../src/main/resources/logback.xml | 13 ----- .../core-java-collections-list/README.md | 12 +++- .../core-java-collections-list/pom.xml | 25 ++++++++ .../VerifyAllEqualListElements.java | 0 .../java/com/ossez}/filtering/Employee.java | 2 +- .../main/java/com/ossez/java/list/Flower.java | 0 .../java/com/ossez}/list/CopyListService.java | 2 +- .../duplicatescounter/DuplicatesCounter.java | 0 .../list/primitive/PrimitiveCollections.java | 0 .../primitive/PrimitivesListPerformance.java | 0 .../VerifyAllEqualListElementsUnitTest.java | 0 .../ossez/collection/CollectionsEmpty.java | 0 .../CollectionFilteringUnitTest.java | 0 .../ossez}/list/CopyListServiceUnitTest.java | 2 +- .../FindDifferencesBetweenListsUnitTest.java | 0 .../DuplicatesCounterUnitTest.java | 0 core-java-modules/pom.xml | 2 - pom.xml | 10 ++++ 20 files changed, 49 insertions(+), 90 deletions(-) delete mode 100644 core-java-modules/core-java-collections-list-3/README.md delete mode 100644 core-java-modules/core-java-collections-list-3/pom.xml delete mode 100644 core-java-modules/core-java-collections-list-3/src/main/resources/logback.xml rename core-java-modules/{core-java-collections-list-3 => core-java-collections-list}/src/main/java/com/ossez/allequalelements/VerifyAllEqualListElements.java (100%) rename core-java-modules/{core-java-collections-list-3/src/main/java/com/ossez/collection => core-java-collections-list/src/main/java/com/ossez}/filtering/Employee.java (95%) rename core-java-modules/{core-java-collections-list-3 => core-java-collections-list}/src/main/java/com/ossez/java/list/Flower.java (100%) rename core-java-modules/{core-java-collections-list-3/src/main/java/com/ossez/java => core-java-collections-list/src/main/java/com/ossez}/list/CopyListService.java (98%) rename core-java-modules/{core-java-collections-list-3 => core-java-collections-list}/src/main/java/com/ossez/list/duplicatescounter/DuplicatesCounter.java (100%) rename core-java-modules/{core-java-collections-list-3 => core-java-collections-list}/src/main/java/com/ossez/list/primitive/PrimitiveCollections.java (100%) rename core-java-modules/{core-java-collections-list-3 => core-java-collections-list}/src/main/java/com/ossez/list/primitive/PrimitivesListPerformance.java (100%) rename core-java-modules/{core-java-collections-list-3 => core-java-collections-list}/src/test/java/com/ossez/allequalelements/VerifyAllEqualListElementsUnitTest.java (100%) rename core-java-modules/{core-java-collections-list-3 => core-java-collections-list}/src/test/java/com/ossez/collection/CollectionsEmpty.java (100%) rename core-java-modules/{core-java-collections-list-3 => core-java-collections-list}/src/test/java/com/ossez/collection/filtering/CollectionFilteringUnitTest.java (100%) rename core-java-modules/{core-java-collections-list-3/src/test/java/com/ossez/java => core-java-collections-list/src/test/java/com/ossez}/list/CopyListServiceUnitTest.java (99%) rename core-java-modules/{core-java-collections-list-3 => core-java-collections-list}/src/test/java/com/ossez/list/difference/FindDifferencesBetweenListsUnitTest.java (100%) rename core-java-modules/{core-java-collections-list-3 => core-java-collections-list}/src/test/java/com/ossez/list/duplicatescounter/DuplicatesCounterUnitTest.java (100%) diff --git a/core-java-modules/core-java-collections-list-3/README.md b/core-java-modules/core-java-collections-list-3/README.md deleted file mode 100644 index 4948e293e6..0000000000 --- a/core-java-modules/core-java-collections-list-3/README.md +++ /dev/null @@ -1,14 +0,0 @@ -## Java 核心（Core Java）集合中的 List 列表 （第3部分） - -This module contains articles about the Java List collection - -### Relevant Articles: -- [Collections.emptyList() vs. New List Instance](https://www.baeldung.com/java-collections-emptylist-new-list) -- [Copy a List to Another List in Java](http://www.baeldung.com/java-copy-list-to-another) -- [Determine If All Elements Are the Same in a Java List](https://www.baeldung.com/java-list-all-equal) -- [List of Primitive Integer Values in Java](https://www.baeldung.com/java-list-primitive-int) -- [Performance Comparison of Primitive Lists in Java](https://www.baeldung.com/java-list-primitive-performance) -- [Filtering a Java Collection by a List](https://www.baeldung.com/java-filter-collection-by-list) -- [How to Count Duplicate Elements in Arraylist](https://www.baeldung.com/java-count-duplicate-elements-arraylist) -- [Finding the Differences Between Two Lists in Java](https://www.baeldung.com/java-lists-difference) -- [[<-- Prev]](/core-java-modules/core-java-collections-list-2) diff --git a/core-java-modules/core-java-collections-list-3/pom.xml b/core-java-modules/core-java-collections-list-3/pom.xml deleted file mode 100644 index 3777d61278..0000000000 --- a/core-java-modules/core-java-collections-list-3/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - 4.0.0 - core-java-collections-list-3 - 0.1.0-SNAPSHOT - core-java-collections-list-3 - jar - - - com.ossez.core-java-modules - core-java-modules - 0.0.2-SNAPSHOT - ../pom.xml - - - - - org.apache.commons - commons-collections4 - ${commons-collections4.version} - - - net.sf.trove4j - trove4j - ${trove4j.version} - - - it.unimi.dsi - fastutil - ${fastutil.version} - - - colt - colt - ${colt.version} - - - org.openjdk.jmh - jmh-core - ${jmh-core.version} - - - org.openjdk.jmh - jmh-generator-annprocess - ${jmh-generator.version} - - - - - 3.0.2 - 8.1.0 - 1.2.0 - - - \ No newline at end of file diff --git a/core-java-modules/core-java-collections-list-3/src/main/resources/logback.xml b/core-java-modules/core-java-collections-list-3/src/main/resources/logback.xml deleted file mode 100644 index 7d900d8ea8..0000000000 --- a/core-java-modules/core-java-collections-list-3/src/main/resources/logback.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - \ No newline at end of file diff --git a/core-java-modules/core-java-collections-list/README.md b/core-java-modules/core-java-collections-list/README.md index 36ceee579c..837fdd8b2c 100644 --- a/core-java-modules/core-java-collections-list/README.md +++ b/core-java-modules/core-java-collections-list/README.md @@ -20,4 +20,14 @@ - [Ways to Iterate Over a List in Java](https://www.baeldung.com/java-iterate-list) - [Flattening Nested Collections in Java](https://www.baeldung.com/java-flatten-nested-collections) - [Intersection of Two Lists in Java](https://www.baeldung.com/java-lists-intersection) -- [Searching for a String in an ArrayList](https://www.baeldung.com/java-search-string-arraylist) \ No newline at end of file +- [Searching for a String in an ArrayList](https://www.baeldung.com/java-search-string-arraylist) +- [Collections.emptyList() vs. New List Instance](https://www.baeldung.com/java-collections-emptylist-new-list) +- [Copy a List to Another List in Java](http://www.baeldung.com/java-copy-list-to-another) +- [Determine If All Elements Are the Same in a Java List](https://www.baeldung.com/java-list-all-equal) +- [List of Primitive Integer Values in Java](https://www.baeldung.com/java-list-primitive-int) +- [Performance Comparison of Primitive Lists in Java](https://www.baeldung.com/java-list-primitive-performance) +- [Filtering a Java Collection by a List](https://www.baeldung.com/java-filter-collection-by-list) +- [How to Count Duplicate Elements in Arraylist](https://www.baeldung.com/java-count-duplicate-elements-arraylist) +- [Finding the Differences Between Two Lists in Java](https://www.baeldung.com/java-lists-difference) +- [List vs. ArrayList in Java](https://www.baeldung.com/java-list-vs-arraylist) +- [Set vs List in Java](https://www.baeldung.com/java-set-vs-list) \ No newline at end of file diff --git a/core-java-modules/core-java-collections-list/pom.xml b/core-java-modules/core-java-collections-list/pom.xml index 5fcd835634..95b0415ca9 100644 --- a/core-java-modules/core-java-collections-list/pom.xml +++ b/core-java-modules/core-java-collections-list/pom.xml @@ -25,6 +25,31 @@ commons-lang3 ${commons-lang3.version} + + net.sf.trove4j + trove4j + ${trove4j.version} + + + it.unimi.dsi + fastutil + ${fastutil.version} + + + colt + colt + ${colt.version} + + + org.openjdk.jmh + jmh-core + ${jmh-core.version} + + + org.openjdk.jmh + jmh-generator-annprocess + ${jmh-generator.version} + \ No newline at end of file diff --git a/core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/allequalelements/VerifyAllEqualListElements.java b/core-java-modules/core-java-collections-list/src/main/java/com/ossez/allequalelements/VerifyAllEqualListElements.java similarity index 100% rename from core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/allequalelements/VerifyAllEqualListElements.java rename to core-java-modules/core-java-collections-list/src/main/java/com/ossez/allequalelements/VerifyAllEqualListElements.java diff --git a/core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/collection/filtering/Employee.java b/core-java-modules/core-java-collections-list/src/main/java/com/ossez/filtering/Employee.java similarity index 95% rename from core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/collection/filtering/Employee.java rename to core-java-modules/core-java-collections-list/src/main/java/com/ossez/filtering/Employee.java index 5ca4e2929d..e4ac3fce1e 100644 --- a/core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/collection/filtering/Employee.java +++ b/core-java-modules/core-java-collections-list/src/main/java/com/ossez/filtering/Employee.java @@ -1,4 +1,4 @@ -package com.ossez.collection.filtering; +package com.ossez.filtering; /** * Java 8 Collection Filtering by List of Values base class. diff --git a/core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/java/list/Flower.java b/core-java-modules/core-java-collections-list/src/main/java/com/ossez/java/list/Flower.java similarity index 100% rename from core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/java/list/Flower.java rename to core-java-modules/core-java-collections-list/src/main/java/com/ossez/java/list/Flower.java diff --git a/core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/java/list/CopyListService.java b/core-java-modules/core-java-collections-list/src/main/java/com/ossez/list/CopyListService.java similarity index 98% rename from core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/java/list/CopyListService.java rename to core-java-modules/core-java-collections-list/src/main/java/com/ossez/list/CopyListService.java index dbbe45d28a..1222c9ee42 100644 --- a/core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/java/list/CopyListService.java +++ b/core-java-modules/core-java-collections-list/src/main/java/com/ossez/list/CopyListService.java @@ -1,4 +1,4 @@ -package com.ossez.java.list; +package com.ossez.list; import java.util.ArrayList; import java.util.Collections; diff --git a/core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/list/duplicatescounter/DuplicatesCounter.java b/core-java-modules/core-java-collections-list/src/main/java/com/ossez/list/duplicatescounter/DuplicatesCounter.java similarity index 100% rename from core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/list/duplicatescounter/DuplicatesCounter.java rename to core-java-modules/core-java-collections-list/src/main/java/com/ossez/list/duplicatescounter/DuplicatesCounter.java diff --git a/core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/list/primitive/PrimitiveCollections.java b/core-java-modules/core-java-collections-list/src/main/java/com/ossez/list/primitive/PrimitiveCollections.java similarity index 100% rename from core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/list/primitive/PrimitiveCollections.java rename to core-java-modules/core-java-collections-list/src/main/java/com/ossez/list/primitive/PrimitiveCollections.java diff --git a/core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/list/primitive/PrimitivesListPerformance.java b/core-java-modules/core-java-collections-list/src/main/java/com/ossez/list/primitive/PrimitivesListPerformance.java similarity index 100% rename from core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/list/primitive/PrimitivesListPerformance.java rename to core-java-modules/core-java-collections-list/src/main/java/com/ossez/list/primitive/PrimitivesListPerformance.java diff --git a/core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/allequalelements/VerifyAllEqualListElementsUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/allequalelements/VerifyAllEqualListElementsUnitTest.java similarity index 100% rename from core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/allequalelements/VerifyAllEqualListElementsUnitTest.java rename to core-java-modules/core-java-collections-list/src/test/java/com/ossez/allequalelements/VerifyAllEqualListElementsUnitTest.java diff --git a/core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/collection/CollectionsEmpty.java b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/collection/CollectionsEmpty.java similarity index 100% rename from core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/collection/CollectionsEmpty.java rename to core-java-modules/core-java-collections-list/src/test/java/com/ossez/collection/CollectionsEmpty.java diff --git a/core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/collection/filtering/CollectionFilteringUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/collection/filtering/CollectionFilteringUnitTest.java similarity index 100% rename from core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/collection/filtering/CollectionFilteringUnitTest.java rename to core-java-modules/core-java-collections-list/src/test/java/com/ossez/collection/filtering/CollectionFilteringUnitTest.java diff --git a/core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/java/list/CopyListServiceUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/list/CopyListServiceUnitTest.java similarity index 99% rename from core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/java/list/CopyListServiceUnitTest.java rename to core-java-modules/core-java-collections-list/src/test/java/com/ossez/list/CopyListServiceUnitTest.java index c4eefc1249..7ca480978a 100644 --- a/core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/java/list/CopyListServiceUnitTest.java +++ b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/list/CopyListServiceUnitTest.java @@ -1,4 +1,4 @@ -package com.ossez.java.list; +package com.ossez.list; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/list/difference/FindDifferencesBetweenListsUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/list/difference/FindDifferencesBetweenListsUnitTest.java similarity index 100% rename from core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/list/difference/FindDifferencesBetweenListsUnitTest.java rename to core-java-modules/core-java-collections-list/src/test/java/com/ossez/list/difference/FindDifferencesBetweenListsUnitTest.java diff --git a/core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/list/duplicatescounter/DuplicatesCounterUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/list/duplicatescounter/DuplicatesCounterUnitTest.java similarity index 100% rename from core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/list/duplicatescounter/DuplicatesCounterUnitTest.java rename to core-java-modules/core-java-collections-list/src/test/java/com/ossez/list/duplicatescounter/DuplicatesCounterUnitTest.java diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml index 9a5afb75d8..be37892eec 100644 --- a/core-java-modules/pom.xml +++ b/core-java-modules/pom.xml @@ -27,14 +27,12 @@ core-java-collections-conversions core-java-collections-conversions-2 core-java-collections-list - core-java-collections-list-3 core-java-datetime-conversion core-java-io core-java-io-2 core-java-lambdas core-java-serialization core-java-streams - core-java-streams core-java-strings core-java-uuid diff --git a/pom.xml b/pom.xml index 6bf67c1d33..a4cc3f186f 100644 --- a/pom.xml +++ b/pom.xml @@ -79,6 +79,9 @@ 31.1-jre 1.18.28 2.12.5 + 1.2.0 + 3.0.3 + 5.0.9 4.3.5.Final @@ -238,6 +241,13 @@ 1.5 + + org.projectlombok + lombok + ${lombok.version} + provided + + httpunit httpunit -- 2.46.2 From 81e009c67e2f87d9b32f26e16ff700395865ce19 Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Tue, 30 Apr 2024 11:00:56 -0400 Subject: [PATCH 2/3] merge code for testing --- .idea/compiler.xml | 4 +- .idea/jarRepositories.xml | 43 +++++++++++++++++-- core-java-modules/core-java-8-2/README.md | 8 +--- .../src/main/resources/example_manifest.txt | 1 - core-java-modules/core-java-8/README.md | 8 +++- .../com/ossez/game/RockPaperScissorsGame.java | 0 .../ChidlCircleInterfaceImpl.java | 0 .../ChildCircleClass.java | 0 .../interfaceVsAbstractClass/CircleClass.java | 0 .../CircleInterface.java | 0 .../com/ossez/jarArguments/JarExample.java | 0 .../main/java/com/ossez/localization/App.java | 1 - .../com/ossez/localization/ICUFormat.java | 0 .../com/ossez/localization/JavaSEFormat.java | 0 .../com/ossez/localization/Localization.java | 0 .../com/ossez/stream/SkipLimitComparison.java | 0 .../main/java/com/ossez/uuid/UuidHelper.java | 0 .../main/resources/META-INF/persistence.xml | 0 .../src/main/resources/formats_en.properties | 0 .../src/main/resources/formats_fr.properties | 0 .../src/main/resources/formats_it.properties | 0 .../src/main/resources/formats_pl.properties | 0 .../src/main/resources/messages_en.properties | 0 .../src/main/resources/messages_fr.properties | 0 .../src/main/resources/messages_it.properties | 0 .../src/main/resources/messages_pl.properties | 0 .../BiFunctionalInterfacesUnitTest.java | 0 .../InterfaceVsAbstractClassUnitTest.java | 0 .../ossez/localization/ICUFormatUnitTest.java | 0 .../core-java-collections-list/pom.xml | 2 +- .../CollectionFilteringUnitTest.java | 1 + core-java-modules/pom.xml | 1 - 32 files changed, 51 insertions(+), 18 deletions(-) delete mode 100644 core-java-modules/core-java-8-2/src/main/resources/example_manifest.txt rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/java/com/ossez/game/RockPaperScissorsGame.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/java/com/ossez/interfaceVsAbstractClass/ChidlCircleInterfaceImpl.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/java/com/ossez/interfaceVsAbstractClass/ChildCircleClass.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/java/com/ossez/interfaceVsAbstractClass/CircleClass.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/java/com/ossez/interfaceVsAbstractClass/CircleInterface.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/java/com/ossez/jarArguments/JarExample.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/java/com/ossez/localization/App.java (93%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/java/com/ossez/localization/ICUFormat.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/java/com/ossez/localization/JavaSEFormat.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/java/com/ossez/localization/Localization.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/java/com/ossez/stream/SkipLimitComparison.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/java/com/ossez/uuid/UuidHelper.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/resources/META-INF/persistence.xml (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/resources/formats_en.properties (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/resources/formats_fr.properties (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/resources/formats_it.properties (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/resources/formats_pl.properties (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/resources/messages_en.properties (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/resources/messages_fr.properties (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/resources/messages_it.properties (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/resources/messages_pl.properties (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/test/java/com/ossez/bifunction/BiFunctionalInterfacesUnitTest.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/test/java/com/ossez/interfaceVsAbstractClass/InterfaceVsAbstractClassUnitTest.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/test/java/com/ossez/localization/ICUFormatUnitTest.java (100%) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 0d92c7f2b6..742bfec4fa 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -27,20 +27,20 @@ - - + + diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index d93942bfe5..3e6cf93d04 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -2,9 +2,9 @@ - - it.unimi.dsi + fastutil fastutil ${fastutil.version} diff --git a/core-java-modules/core-java-collections-list/src/test/java/com/ossez/collection/filtering/CollectionFilteringUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/collection/filtering/CollectionFilteringUnitTest.java index 0ad2b8d273..e8c54ca136 100644 --- a/core-java-modules/core-java-collections-list/src/test/java/com/ossez/collection/filtering/CollectionFilteringUnitTest.java +++ b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/collection/filtering/CollectionFilteringUnitTest.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; +import com.ossez.filtering.Employee; import org.hamcrest.Matchers; import org.junit.Assert; import org.junit.Test; diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml index be37892eec..b638264f5e 100644 --- a/core-java-modules/pom.xml +++ b/core-java-modules/pom.xml @@ -17,7 +17,6 @@ core-java core-java-8 - core-java-8-2 core-java-11 core-java-11-2 core-java-annotations -- 2.46.2 From 8f011093e51d6f181427324342bf98526fa54ff4 Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Tue, 30 Apr 2024 11:34:11 -0400 Subject: [PATCH 3/3] Change properties file by use encoding UTF-8 --- core-java-modules/core-java-8-2/.gitignore | 25 ----------------- core-java-modules/core-java-8-2/README.md | 7 ----- core-java-modules/core-java-8-2/pom.xml | 28 ------------------- .../src/main/resources/formats_fr.properties | 4 +-- .../src/main/resources/formats_pl.properties | 2 +- .../src/main/resources/messages_fr.properties | 2 +- .../src/main/resources/messages_it.properties | 2 +- pom.xml | 18 ++++++++++-- 8 files changed, 20 insertions(+), 68 deletions(-) delete mode 100644 core-java-modules/core-java-8-2/.gitignore delete mode 100644 core-java-modules/core-java-8-2/README.md delete mode 100644 core-java-modules/core-java-8-2/pom.xml diff --git a/core-java-modules/core-java-8-2/.gitignore b/core-java-modules/core-java-8-2/.gitignore deleted file mode 100644 index 374c8bf907..0000000000 --- a/core-java-modules/core-java-8-2/.gitignore +++ /dev/null @@ -1,25 +0,0 @@ -*.class - -0.* - -#folders# -/target -/neoDb* -/data -/src/main/webapp/WEB-INF/classes -*/META-INF/* -.resourceCache - -# Packaged files # -*.jar -*.war -*.ear - -# Files generated by integration tests -backup-pom.xml -/bin/ -/temp - -#IntelliJ specific -.idea/ -*.iml \ No newline at end of file diff --git a/core-java-modules/core-java-8-2/README.md b/core-java-modules/core-java-8-2/README.md deleted file mode 100644 index cb4d816400..0000000000 --- a/core-java-modules/core-java-8-2/README.md +++ /dev/null @@ -1,7 +0,0 @@ -## Java 8 核心（第 2 部分） - -本模块中包含有关 Java 8 核心新增功能特性的一些文章。 - -### 相关文章 - -- [[<-- Java 8 核心（第 1 部分）]](/core-java-modules/core-java-8) diff --git a/core-java-modules/core-java-8-2/pom.xml b/core-java-modules/core-java-8-2/pom.xml deleted file mode 100644 index 7c8a59c157..0000000000 --- a/core-java-modules/core-java-8-2/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - core-java-8-2 - core-java-8-2 - jar - - - com.ossez.core-java-modules - core-java-modules - 0.0.2-SNAPSHOT - - - - - com.ibm.icu - icu4j - ${icu.version} - - - - - 64.2 - - - \ No newline at end of file diff --git a/core-java-modules/core-java-8/src/main/resources/formats_fr.properties b/core-java-modules/core-java-8/src/main/resources/formats_fr.properties index c2d5159b32..218385c54c 100644 --- a/core-java-modules/core-java-8/src/main/resources/formats_fr.properties +++ b/core-java-modules/core-java-8/src/main/resources/formats_fr.properties @@ -1,2 +1,2 @@ -label={0, date, short}, {1}{2, choice, 0# ne|0<} vous a envoy {2, choice, 0#aucun message|1#un message|2#deux messages|2<{2,number,integer} messages}. -label-icu={0} {2, plural, =0 {ne } other {}}vous a envoy {2, plural, =0 {aucun message} =1 {un message} other {{2, number, integer} messages}}. \ No newline at end of file +label={0, date, short}, {1}{2, choice, 0# ne|0<} vous a envoyé {2, choice, 0#aucun message|1#un message|2#deux messages|2<{2,number,integer} messages}. +label-icu={0} {2, plural, =0 {ne } other {}}vous a envoyé {2, plural, =0 {aucun message} =1 {un message} other {{2, number, integer} messages}}. \ No newline at end of file diff --git a/core-java-modules/core-java-8/src/main/resources/formats_pl.properties b/core-java-modules/core-java-8/src/main/resources/formats_pl.properties index 9333ec3396..dc63d3720b 100644 --- a/core-java-modules/core-java-8/src/main/resources/formats_pl.properties +++ b/core-java-modules/core-java-8/src/main/resources/formats_pl.properties @@ -1,2 +1,2 @@ label=W {0, date, short} {1}{2, choice, 0# nie|0<} wys\u0142a\u0142a ci {2, choice, 0#\u017Cadnych wiadomo\u015Bci|1#wiadomo\u015B\u0107|2#dwie wiadomo\u015Bci|2<{2, number, integer} wiadomo\u015Bci}. -label-icu={0} {2, plural, =0 {nie } other {}}{1, select, male {wys\u0142a\u0142} female {wys\u0142a\u0142a} other {wys\u0142a\u0142o}} ci {2, plural, =0 {\u017Cadnej wiadomo\u015Bci} =1 {wiadomo\u015B\u0107} other {{2, number, integer} wiadomo\u015Bci}}. +label-icu={0} {2, plural, =0 {nie } other {}}{1, select, male {wys\u0142a\u0142} female {wys\u0142a\u0142a} other {wys\u0142a\u0142o}} ci {2, plural, =0 {\u017Cadnej wiadomo\u015Bci} =1 {wiadomo\u015B\u0107} other {{2, number, integer} wiadomo\u015Bci}}. \ No newline at end of file diff --git a/core-java-modules/core-java-8/src/main/resources/messages_fr.properties b/core-java-modules/core-java-8/src/main/resources/messages_fr.properties index 6716102568..9c1c9f9322 100644 --- a/core-java-modules/core-java-8/src/main/resources/messages_fr.properties +++ b/core-java-modules/core-java-8/src/main/resources/messages_fr.properties @@ -1 +1 @@ -label=Alice vous a envoy un message. \ No newline at end of file +label=Alice vous a envoyé un message. \ No newline at end of file diff --git a/core-java-modules/core-java-8/src/main/resources/messages_it.properties b/core-java-modules/core-java-8/src/main/resources/messages_it.properties index 6929a8c091..be694a3ae7 100644 --- a/core-java-modules/core-java-8/src/main/resources/messages_it.properties +++ b/core-java-modules/core-java-8/src/main/resources/messages_it.properties @@ -1 +1 @@ -label=Alice ti ha inviato un messaggio. \ No newline at end of file +label=Alice ti ha inviato un messaggio. \ No newline at end of file diff --git a/pom.xml b/pom.xml index a4cc3f186f..21cf3f48c0 100644 --- a/pom.xml +++ b/pom.xml @@ -118,11 +118,15 @@ 1.3 1.33 3.0.0 - 3.0.0-M8 - 3.10.1 + 1.2.5 3.1.1 + + 3.3.1 + 3.0.0-M8 + 3.10.1 + @@ -339,7 +343,6 @@ - org.apache.maven.plugins @@ -347,6 +350,15 @@ ${maven-compiler-plugin.version} ${java.version} + UTF-8 + + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin.version} + + UTF-8 -- 2.46.2