From a2be284062a477d7fe26d2e331a34befbdae1010 Mon Sep 17 00:00:00 2001 From: mytang0 Date: Thu, 29 Feb 2024 01:03:28 +0800 Subject: [PATCH 1/4] Fix javadoc bug --- .../xyz/mytang0/brook/spring/boot/computing/SpelEngine.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/computing/SpelEngine.java b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/computing/SpelEngine.java index f4e291a..a2436b3 100644 --- a/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/computing/SpelEngine.java +++ b/brook-spring-boot/brook-spring-boot-autoconfigure/src/main/java/xyz/mytang0/brook/spring/boot/computing/SpelEngine.java @@ -13,9 +13,6 @@ import java.util.Map; import java.util.concurrent.TimeUnit; -/** - * @link ... - */ @Slf4j public class SpelEngine implements Engine { From e2c9f258ec44332285ae2e777de8dc46f41ca74a Mon Sep 17 00:00:00 2001 From: mytang0 Date: Fri, 1 Mar 2024 12:43:32 +0800 Subject: [PATCH 2/4] Publish to central repository --- .gitignore | 1 + README.md | 2 +- brook-common/pom.xml | 2 +- brook-core/pom.xml | 2 +- brook-demo/brook-demo-spring/pom.xml | 3 - brook-demo/pom.xml | 2 +- brook-engine/pom.xml | 2 +- .../brook-computing-extensions/pom.xml | 2 +- .../brook-lock-redis/pom.xml | 2 +- .../brook-lock-extensions/pom.xml | 2 +- .../brook-metadata-http/pom.xml | 2 +- .../brook-metadata-extensions/pom.xml | 2 +- .../brook-oss-extensions/brook-oss-s3/pom.xml | 16 --- .../brook-oss-extensions/pom.xml | 3 +- .../brook-task-http/pom.xml | 2 +- .../brook-task-extensions/pom.xml | 2 +- brook-spi-extensions/pom.xml | 2 +- brook-spi/pom.xml | 2 +- .../brook-spring-boot-autoconfigure/pom.xml | 2 +- .../brook-spring-boot-lock-redis/pom.xml | 2 +- .../brook-spring-boot-locks/pom.xml | 2 +- .../brook-spring-boot-http-metadata/pom.xml | 2 +- .../brook-spring-boot-metadata/pom.xml | 2 +- .../brook-spring-boot-mybatis/pom.xml | 2 +- .../brook-spring-boot-starter/pom.xml | 2 +- brook-spring-boot/pom.xml | 2 +- pom.xml | 136 ++++++++++-------- 27 files changed, 101 insertions(+), 102 deletions(-) delete mode 100644 brook-spi-extensions/brook-oss-extensions/brook-oss-s3/pom.xml diff --git a/.gitignore b/.gitignore index 4968684..4263598 100644 --- a/.gitignore +++ b/.gitignore @@ -174,4 +174,5 @@ buildNumber.properties logs/ .git/ +**/.flattened-pom.xml ~ diff --git a/README.md b/README.md index 099ed0d..9e45cce 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ For expedited testing. mvn archetype:generate \ -DarchetypeGroupId=xyz.mytang0.brook.demo \ -DarchetypeArtifactId=brook-demo-spring-archetype \ - -DarchetypeVersion=1.0.0-SNAPSHOT \ + -DarchetypeVersion=1.0.0-alpha \ -DgroupId= \ -DartifactId= \ -DinteractiveMode=false \ diff --git a/brook-common/pom.xml b/brook-common/pom.xml index a27c633..e531221 100644 --- a/brook-common/pom.xml +++ b/brook-common/pom.xml @@ -7,12 +7,12 @@ xyz.mytang0.brook brook-parent ${revision} - ../pom.xml brook-common jar ${project.artifactId} + The common module of brook project. diff --git a/brook-core/pom.xml b/brook-core/pom.xml index 0d2377d..90c24d2 100644 --- a/brook-core/pom.xml +++ b/brook-core/pom.xml @@ -7,12 +7,12 @@ xyz.mytang0.brook brook-parent ${revision} - ../pom.xml brook-core jar ${project.artifactId} + The core module of brook project. diff --git a/brook-demo/brook-demo-spring/pom.xml b/brook-demo/brook-demo-spring/pom.xml index 9e4b26f..68a1f28 100644 --- a/brook-demo/brook-demo-spring/pom.xml +++ b/brook-demo/brook-demo-spring/pom.xml @@ -7,7 +7,6 @@ xyz.mytang0.brook brook-demo ${revision} - ../pom.xml xyz.mytang0.brook.demo @@ -15,8 +14,6 @@ ${revision} - true - 2.0.3.RELEASE diff --git a/brook-demo/pom.xml b/brook-demo/pom.xml index e653935..90cbc1e 100644 --- a/brook-demo/pom.xml +++ b/brook-demo/pom.xml @@ -7,7 +7,6 @@ xyz.mytang0.brook brook-parent ${revision} - ../pom.xml brook-demo @@ -15,6 +14,7 @@ ${project.artifactId} + true 3.2.0 diff --git a/brook-engine/pom.xml b/brook-engine/pom.xml index 4956b17..25e9d95 100644 --- a/brook-engine/pom.xml +++ b/brook-engine/pom.xml @@ -7,12 +7,12 @@ xyz.mytang0.brook brook-parent ${revision} - ../pom.xml brook-engine jar ${project.artifactId} + The engine module of brook project. diff --git a/brook-spi-extensions/brook-computing-extensions/pom.xml b/brook-spi-extensions/brook-computing-extensions/pom.xml index b47396d..9ab0541 100644 --- a/brook-spi-extensions/brook-computing-extensions/pom.xml +++ b/brook-spi-extensions/brook-computing-extensions/pom.xml @@ -7,12 +7,12 @@ xyz.mytang0.brook brook-spi-extensions ${revision} - ../pom.xml brook-computing-extensions pom ${project.artifactId} + The computing extensions module of brook project. diff --git a/brook-spi-extensions/brook-lock-extensions/brook-lock-redis/pom.xml b/brook-spi-extensions/brook-lock-extensions/brook-lock-redis/pom.xml index 0fa13a0..65ecaf5 100644 --- a/brook-spi-extensions/brook-lock-extensions/brook-lock-redis/pom.xml +++ b/brook-spi-extensions/brook-lock-extensions/brook-lock-redis/pom.xml @@ -7,12 +7,12 @@ xyz.mytang0.brook brook-lock-extensions ${revision} - ../pom.xml brook-lock-redis jar ${project.artifactId} + The redis lock module of brook project. 3.18.0 diff --git a/brook-spi-extensions/brook-lock-extensions/pom.xml b/brook-spi-extensions/brook-lock-extensions/pom.xml index 0b30405..029ea60 100644 --- a/brook-spi-extensions/brook-lock-extensions/pom.xml +++ b/brook-spi-extensions/brook-lock-extensions/pom.xml @@ -7,12 +7,12 @@ xyz.mytang0.brook brook-spi-extensions ${revision} - ../pom.xml brook-lock-extensions pom ${project.artifactId} + The lock extensions module of brook project. brook-lock-redis diff --git a/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/pom.xml b/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/pom.xml index bbc5f56..47024bb 100644 --- a/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/pom.xml +++ b/brook-spi-extensions/brook-metadata-extensions/brook-metadata-http/pom.xml @@ -7,12 +7,12 @@ xyz.mytang0.brook brook-metadata-extensions ${revision} - ../pom.xml brook-metadata-http jar ${project.artifactId} + The http metadata module of brook project. 4.1.3 diff --git a/brook-spi-extensions/brook-metadata-extensions/pom.xml b/brook-spi-extensions/brook-metadata-extensions/pom.xml index 5ce717c..74e1510 100644 --- a/brook-spi-extensions/brook-metadata-extensions/pom.xml +++ b/brook-spi-extensions/brook-metadata-extensions/pom.xml @@ -7,12 +7,12 @@ xyz.mytang0.brook brook-spi-extensions ${revision} - ../pom.xml brook-metadata-extensions pom ${project.artifactId} + The metadata extensions module of brook project. brook-metadata-http diff --git a/brook-spi-extensions/brook-oss-extensions/brook-oss-s3/pom.xml b/brook-spi-extensions/brook-oss-extensions/brook-oss-s3/pom.xml deleted file mode 100644 index 386d700..0000000 --- a/brook-spi-extensions/brook-oss-extensions/brook-oss-s3/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - 4.0.0 - - xyz.mytang0.brook - brook-oss-extensions - ${revision} - ../pom.xml - - - brook-oss-s3 - jar - ${project.artifactId} - \ No newline at end of file diff --git a/brook-spi-extensions/brook-oss-extensions/pom.xml b/brook-spi-extensions/brook-oss-extensions/pom.xml index 2fdcd6e..85424ca 100644 --- a/brook-spi-extensions/brook-oss-extensions/pom.xml +++ b/brook-spi-extensions/brook-oss-extensions/pom.xml @@ -7,14 +7,13 @@ xyz.mytang0.brook brook-spi-extensions ${revision} - ../pom.xml brook-oss-extensions pom ${project.artifactId} + The oss extensions module of brook project. - brook-oss-s3 \ No newline at end of file diff --git a/brook-spi-extensions/brook-task-extensions/brook-task-http/pom.xml b/brook-spi-extensions/brook-task-extensions/brook-task-http/pom.xml index ecc44bf..e97983d 100644 --- a/brook-spi-extensions/brook-task-extensions/brook-task-http/pom.xml +++ b/brook-spi-extensions/brook-task-extensions/brook-task-http/pom.xml @@ -7,12 +7,12 @@ xyz.mytang0.brook brook-task-extensions ${revision} - ../pom.xml brook-task-http jar ${project.artifactId} + The http task module of brook project. 4.1.3 diff --git a/brook-spi-extensions/brook-task-extensions/pom.xml b/brook-spi-extensions/brook-task-extensions/pom.xml index 4072d9e..b65cbfb 100644 --- a/brook-spi-extensions/brook-task-extensions/pom.xml +++ b/brook-spi-extensions/brook-task-extensions/pom.xml @@ -7,12 +7,12 @@ xyz.mytang0.brook brook-spi-extensions ${revision} - ../pom.xml brook-task-extensions pom ${project.artifactId} + The task extensions module of brook project. brook-task-http diff --git a/brook-spi-extensions/pom.xml b/brook-spi-extensions/pom.xml index 2f4e2ac..bdc930f 100644 --- a/brook-spi-extensions/pom.xml +++ b/brook-spi-extensions/pom.xml @@ -7,12 +7,12 @@ xyz.mytang0.brook brook-parent ${revision} - ../pom.xml brook-spi-extensions pom ${project.artifactId} + The spi extensions module of brook project. brook-task-extensions diff --git a/brook-spi/pom.xml b/brook-spi/pom.xml index 1d41e2d..13f4dfc 100644 --- a/brook-spi/pom.xml +++ b/brook-spi/pom.xml @@ -7,12 +7,12 @@ xyz.mytang0.brook brook-parent ${revision} - ../pom.xml brook-spi jar ${project.artifactId} + The spi module of brook project. diff --git a/brook-spring-boot/brook-spring-boot-autoconfigure/pom.xml b/brook-spring-boot/brook-spring-boot-autoconfigure/pom.xml index fa251d8..f11b61b 100644 --- a/brook-spring-boot/brook-spring-boot-autoconfigure/pom.xml +++ b/brook-spring-boot/brook-spring-boot-autoconfigure/pom.xml @@ -7,12 +7,12 @@ xyz.mytang0.brook brook-spring-boot ${revision} - ../pom.xml brook-spring-boot-autoconfigure jar ${project.artifactId} + The spring boot autoconfigure module of brook project. diff --git a/brook-spring-boot/brook-spring-boot-locks/brook-spring-boot-lock-redis/pom.xml b/brook-spring-boot/brook-spring-boot-locks/brook-spring-boot-lock-redis/pom.xml index 08dede1..18ac6ae 100644 --- a/brook-spring-boot/brook-spring-boot-locks/brook-spring-boot-lock-redis/pom.xml +++ b/brook-spring-boot/brook-spring-boot-locks/brook-spring-boot-lock-redis/pom.xml @@ -7,12 +7,12 @@ xyz.mytang0.brook brook-spring-boot-locks ${revision} - ../pom.xml brook-spring-boot-lock-redis jar ${project.artifactId} + The spring boot redis lock module of brook project. ${project.version} diff --git a/brook-spring-boot/brook-spring-boot-locks/pom.xml b/brook-spring-boot/brook-spring-boot-locks/pom.xml index ab55556..0c5a949 100644 --- a/brook-spring-boot/brook-spring-boot-locks/pom.xml +++ b/brook-spring-boot/brook-spring-boot-locks/pom.xml @@ -7,12 +7,12 @@ xyz.mytang0.brook brook-spring-boot ${revision} - ../pom.xml brook-spring-boot-locks pom ${project.artifactId} + The spring boot locks module of brook project. brook-spring-boot-lock-redis diff --git a/brook-spring-boot/brook-spring-boot-metadata/brook-spring-boot-http-metadata/pom.xml b/brook-spring-boot/brook-spring-boot-metadata/brook-spring-boot-http-metadata/pom.xml index c09f961..c244755 100644 --- a/brook-spring-boot/brook-spring-boot-metadata/brook-spring-boot-http-metadata/pom.xml +++ b/brook-spring-boot/brook-spring-boot-metadata/brook-spring-boot-http-metadata/pom.xml @@ -7,12 +7,12 @@ xyz.mytang0.brook brook-spring-boot-metadata ${revision} - ../pom.xml brook-spring-boot-http-metadata jar ${project.artifactId} + The spring boot http metadata module of brook project. ${project.version} diff --git a/brook-spring-boot/brook-spring-boot-metadata/pom.xml b/brook-spring-boot/brook-spring-boot-metadata/pom.xml index f961f7e..c5c8a35 100644 --- a/brook-spring-boot/brook-spring-boot-metadata/pom.xml +++ b/brook-spring-boot/brook-spring-boot-metadata/pom.xml @@ -7,12 +7,12 @@ xyz.mytang0.brook brook-spring-boot ${revision} - ../pom.xml brook-spring-boot-metadata pom ${project.artifactId} + The spring boot metadata module of brook project. brook-spring-boot-http-metadata diff --git a/brook-spring-boot/brook-spring-boot-mybatis/pom.xml b/brook-spring-boot/brook-spring-boot-mybatis/pom.xml index 3df5929..c73e9f9 100644 --- a/brook-spring-boot/brook-spring-boot-mybatis/pom.xml +++ b/brook-spring-boot/brook-spring-boot-mybatis/pom.xml @@ -7,12 +7,12 @@ xyz.mytang0.brook brook-spring-boot ${revision} - ../pom.xml brook-spring-boot-mybatis jar ${project.artifactId} + The spring boot mybatis module of brook project. 3.4.2 diff --git a/brook-spring-boot/brook-spring-boot-starter/pom.xml b/brook-spring-boot/brook-spring-boot-starter/pom.xml index 092394d..96d6607 100644 --- a/brook-spring-boot/brook-spring-boot-starter/pom.xml +++ b/brook-spring-boot/brook-spring-boot-starter/pom.xml @@ -7,12 +7,12 @@ xyz.mytang0.brook brook-spring-boot ${revision} - ../pom.xml brook-spring-boot-starter jar ${project.artifactId} + The spring boot starter module of brook project. diff --git a/brook-spring-boot/pom.xml b/brook-spring-boot/pom.xml index 626d84f..1c44405 100644 --- a/brook-spring-boot/pom.xml +++ b/brook-spring-boot/pom.xml @@ -7,12 +7,12 @@ xyz.mytang0.brook brook-parent ${revision} - ../pom.xml brook-spring-boot pom ${project.artifactId} + The spring boot module of brook project. 2.0.3.RELEASE diff --git a/pom.xml b/pom.xml index e7e941b..ede7705 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ ${project.artifactId} - The parent project of brook + The parent project of brook. https://github.com/mytang0/brook @@ -50,14 +50,21 @@ + + + + + GitLab Issues - https://github.com/mytang0/brook/-/issues + https://github.com/mytang0/brook/issues - UTF-8 - 1.8 + 1.0.0-alpha + 1.8 + 1.8 + UTF-8 6.18 4.13.1 1.33 @@ -96,17 +103,18 @@ 3.0.0-M2 3.10.1 3.1.0 - 3.0.1 - 4.3.0 + 3.3.0 3.2.1 - 3.0.1 + 3.6.3 + 3.0.1 1.6 + 1.5.0 + + 0.3.8 true false - - 1.0.0-SNAPSHOT @@ -118,25 +126,14 @@ - org.codehaus.mojo - exec-maven-plugin - ${exec-maven-plugin.version} + org.apache.maven.plugins + maven-source-plugin + ${maven-source-plugin.version} - git submodule update - initialize - false - - git - - submodule - update - --init - --recursive - - + attach-sources - exec + jar @@ -147,13 +144,29 @@ maven-javadoc-plugin ${maven-javadoc-plugin.version} - true - false - all,-missing + public + ${file.encoding} + ${file.encoding} + ${file.encoding} + ${maven-source-plugin.version} + none + Brook ${project.version} API + Brook ${project.version} API + true + + xyz.mytang0.brook:brook-* + + + xyz.mytang0.brook:brook-demo + xyz.mytang0.brook.demo:* + + + https://docs.oracle.com/javase/8/docs/api + - attach-javadocs + attach-javadoc jar @@ -175,6 +188,21 @@ + + + org.sonatype.central + central-publishing-maven-plugin + ${publishing-maven-plugin.version} + true + + central + true + + brook-demo + brook-demo-spring + + + @@ -461,9 +489,6 @@ 1.8 - - 3.5 - @@ -481,41 +506,34 @@ -Xlint:deprecation true - ${compiler.version} - ${compiler.version} - ${project.build.sourceEncoding} + ${java.source.version} + ${java.target.version} + ${file.encoding} - org.apache.maven.plugins - maven-resources-plugin - ${maven-resource-plugin.version} + org.codehaus.mojo + flatten-maven-plugin + ${maven-flatten-plugin.version} - ${project.build.sourceEncoding} + true + oss - - - - com.spotify - docker-maven-plugin - ${docker.plugin.version} - - true - - - - - org.apache.maven.plugins - maven-source-plugin - ${maven-source-plugin.version} - attach-sources - none + flatten + + flatten + + process-resources + + + flatten.clean - jar + clean + clean @@ -526,8 +544,8 @@ ${maven-checkstyle-plugin.version} codestyle/checkstyle.xml - UTF-8 - UTF-8 + ${file.encoding} + ${file.encoding} true true ${checkstyle.fails.on.error} From 41f4677ffa7dd7c0d8193f550e29fe64c5a53e7f Mon Sep 17 00:00:00 2001 From: mytang0 Date: Fri, 1 Mar 2024 16:07:29 +0800 Subject: [PATCH 3/4] Fix javadoc warning --- .../xyz/mytang0/brook/common/configuration/ConfigOptions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/ConfigOptions.java b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/ConfigOptions.java index f3d9b9f..d2743ba 100644 --- a/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/ConfigOptions.java +++ b/brook-common/src/main/java/xyz/mytang0/brook/common/configuration/ConfigOptions.java @@ -253,7 +253,7 @@ public ConfigOption noDefaultValue() { } /** - * Builder for {@link ConfigOption} of list of type {@link E}. + * Builder for {@link ConfigOption} of list of type E. * * @param list element type of the option */ From 46197507dba9ec3f31892ee0b2ad1abf9168402b Mon Sep 17 00:00:00 2001 From: mytang0 Date: Fri, 1 Mar 2024 16:07:51 +0800 Subject: [PATCH 4/4] Upgrade publishing plugin --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ede7705..9413ff7 100644 --- a/pom.xml +++ b/pom.xml @@ -109,8 +109,7 @@ 3.0.1 1.6 1.5.0 - - 0.3.8 + 0.4.0 true