diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000000..d57f34c021 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,27 @@ +pipeline { + agent any + + tools { + maven 'maven 3.8.4' + jdk 'OpenJDK-11' + } + + stages { + stage('Build') { + steps { + echo 'Building..' + sh 'mvn clean package' + } + } + stage('Test') { + steps { + echo 'Testing..' + } + } + stage('Deploy') { + steps { + echo 'Deploying....' + } + } + } +} \ No newline at end of file diff --git a/core-java-modules/core-java-collections-3/pom.xml b/core-java-modules/core-java-collections-3/pom.xml index fd598103a5..956e369992 100644 --- a/core-java-modules/core-java-collections-3/pom.xml +++ b/core-java-modules/core-java-collections-3/pom.xml @@ -11,7 +11,6 @@ com.ossez.core-java-modules core-java-modules 0.0.2-SNAPSHOT - ../pom.xml @@ -34,6 +33,7 @@ 0.10 + 1.3 \ No newline at end of file diff --git a/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/arraylistvsvector/ArrayListBenchmark.java b/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/arraylistvsvector/ArrayListBenchmark.java index 850b98c137..e92dec7771 100644 --- a/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/arraylistvsvector/ArrayListBenchmark.java +++ b/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/arraylistvsvector/ArrayListBenchmark.java @@ -1,4 +1,4 @@ -package com.ossez.collections.collections.arraylistvsvector; +package com.ossez.collections.arraylistvsvector; import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.runner.Runner; diff --git a/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/arraylistvsvector/Employee.java b/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/arraylistvsvector/Employee.java index a271f455fe..2f5ca88221 100644 --- a/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/arraylistvsvector/Employee.java +++ b/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/arraylistvsvector/Employee.java @@ -1,4 +1,4 @@ -package com.ossez.collections.collections.arraylistvsvector; +package com.ossez.collections.arraylistvsvector; public class Employee { diff --git a/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/arraylistvsvector/VectorExample.java b/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/arraylistvsvector/VectorExample.java index d38b23ab74..3b8abba3a2 100644 --- a/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/arraylistvsvector/VectorExample.java +++ b/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/arraylistvsvector/VectorExample.java @@ -1,4 +1,4 @@ -package com.ossez.collections.collections.arraylistvsvector; +package com.ossez.collections.arraylistvsvector; import java.util.Enumeration; import java.util.Iterator; diff --git a/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/containsperformance/CollectionsBenchmark.java b/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/containsperformance/CollectionsBenchmark.java index a7ed3c12e6..a9fcfced36 100644 --- a/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/containsperformance/CollectionsBenchmark.java +++ b/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/containsperformance/CollectionsBenchmark.java @@ -1,4 +1,4 @@ -package com.ossez.collections.collections.containsperformance; +package com.ossez.collections.containsperformance; import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.runner.Runner; diff --git a/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/containsperformance/Employee.java b/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/containsperformance/Employee.java index 4e9bd3c215..1d7b27d02f 100644 --- a/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/containsperformance/Employee.java +++ b/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/containsperformance/Employee.java @@ -1,4 +1,4 @@ -package com.ossez.collections.collections.containsperformance; +package com.ossez.collections.containsperformance; public class Employee { diff --git a/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/iterators/Iterators.java b/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/iterators/Iterators.java index a98c2b6ff9..40e451c09d 100644 --- a/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/iterators/Iterators.java +++ b/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/iterators/Iterators.java @@ -1,4 +1,4 @@ -package com.ossez.collections.collections.iterators; +package com.ossez.collections.iterators; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/removeallperformance/HashSetBenchmark.java b/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/removeallperformance/HashSetBenchmark.java index 29a692e4de..8d4fb58246 100644 --- a/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/removeallperformance/HashSetBenchmark.java +++ b/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/removeallperformance/HashSetBenchmark.java @@ -1,4 +1,4 @@ -package com.ossez.collections.collections.removeallperformance; +package com.ossez.collections.removeallperformance; import java.util.ArrayList; import java.util.HashSet; @@ -6,7 +6,7 @@ import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; -import com.ossez.collections.collections.containsperformance.Employee; +import com.ossez.collections.containsperformance.Employee; import org.apache.commons.lang3.RandomStringUtils; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; diff --git a/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/sortingcomparison/ArraySortBenchmark.java b/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/sortingcomparison/ArraySortBenchmark.java index 651fe06d14..a048435228 100644 --- a/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/sortingcomparison/ArraySortBenchmark.java +++ b/core-java-modules/core-java-collections-3/src/main/java/com/ossez/collections/sortingcomparison/ArraySortBenchmark.java @@ -1,4 +1,4 @@ -package com.ossez.collections.collections.sortingcomparison; +package com.ossez.collections.sortingcomparison; import java.util.Arrays; import java.util.concurrent.TimeUnit; diff --git a/core-java-modules/core-java-collections-3/src/test/java/com/ossez/collections/iterators/IteratorsUnitTest.java b/core-java-modules/core-java-collections-3/src/test/java/com/ossez/collections/iterators/IteratorsUnitTest.java index a1cc43fff2..cec0981947 100644 --- a/core-java-modules/core-java-collections-3/src/test/java/com/ossez/collections/iterators/IteratorsUnitTest.java +++ b/core-java-modules/core-java-collections-3/src/test/java/com/ossez/collections/iterators/IteratorsUnitTest.java @@ -1,8 +1,8 @@ package com.ossez.collections.iterators; -import static com.ossez.collections.collections.iterators.Iterators.failFast1; -import static com.ossez.collections.collections.iterators.Iterators.failFast2; -import static com.ossez.collections.collections.iterators.Iterators.failSafe1; +import static com.ossez.collections.iterators.Iterators.failFast1; +import static com.ossez.collections.iterators.Iterators.failFast2; +import static com.ossez.collections.iterators.Iterators.failSafe1; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/core-java-modules/core-java-numbers/README.md b/core-java-modules/core-java-numbers/README.md index 1fdc2e11e5..86c826632a 100644 --- a/core-java-modules/core-java-numbers/README.md +++ b/core-java-modules/core-java-numbers/README.md @@ -1,6 +1,6 @@ ## Java 数字（Number） -这个模块中包含有关 Java 数字（Number）有关的文章。 +本模块中包含有关 Java 数字（Number）有关的文章。 ### 相关文章 - [理解 Java 中的 NumberFormatException 异常](https://www.ossez.com/t/java-numberformatexception/13986) diff --git a/core-java-modules/core-java-numbers/pom.xml b/core-java-modules/core-java-numbers/pom.xml index ed8f98885b..a37e3398bd 100644 --- a/core-java-modules/core-java-numbers/pom.xml +++ b/core-java-modules/core-java-numbers/pom.xml @@ -8,10 +8,9 @@ jar - com.ossez - parent-modules + com.ossez.core-java-modules + core-java-modules 0.0.2-SNAPSHOT - ../pom.xml @@ -49,7 +48,7 @@ 61.1 - 15 + 11 \ No newline at end of file diff --git a/core-java-modules/core-java-strings/README.md b/core-java-modules/core-java-strings/README.md index 419565afa7..f951c9d357 100644 --- a/core-java-modules/core-java-strings/README.md +++ b/core-java-modules/core-java-strings/README.md @@ -1,6 +1,6 @@ ## Java 字符串（Strings） -This module contains articles about strings in Java. +本模块中包含有关 Java 字符串（String）有关的文章。 ### 相关文章 - [Use char[] Array over a String for Manipulating Passwords in Java?](https://www.baeldung.com/java-storing-passwords) diff --git a/core-java-modules/core-java-strings/pom.xml b/core-java-modules/core-java-strings/pom.xml index f3558f0200..f1abfb436c 100644 --- a/core-java-modules/core-java-strings/pom.xml +++ b/core-java-modules/core-java-strings/pom.xml @@ -8,10 +8,9 @@ jar - com.ossez - parent-modules + com.ossez.core-java-modules + core-java-modules 0.0.2-SNAPSHOT - ../pom.xml @@ -49,7 +48,7 @@ 61.1 - 15 + 11 \ No newline at end of file diff --git a/core-java-modules/core-java-strings/src/main/java/com/ossez/localization/App.java b/core-java-modules/core-java-strings/src/main/java/com/ossez/localization/App.java index 3fe6d8a267..7a111435e2 100644 --- a/core-java-modules/core-java-strings/src/main/java/com/ossez/localization/App.java +++ b/core-java-modules/core-java-strings/src/main/java/com/ossez/localization/App.java @@ -6,13 +6,13 @@ import java.util.List; import java.util.Locale; public class App { - /** * Runs all available formatter - * @throws ParseException + * + * @param args inputs */ public static void main(String[] args) { - List locales = Arrays.asList(new Locale[] { Locale.UK, Locale.ITALY, Locale.FRANCE, Locale.forLanguageTag("pl-PL") }); + List locales = Arrays.asList(new Locale[]{Locale.UK, Locale.ITALY, Locale.FRANCE, Locale.forLanguageTag("pl-PL")}); Localization.run(locales); JavaSEFormat.run(locales); ICUFormat.run(locales); diff --git a/pom.xml b/pom.xml index 8513b38609..118265cceb 100644 --- a/pom.xml +++ b/pom.xml @@ -341,7 +341,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.2 + 3.4.0 attach-javadocs