diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 803d69c..4c4aa8c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.8 - server-id: ossrh + server-id: ossrh # 这个很重要需要和distributionManagement/repository/id一致(plugin内也一致) server-username: ${{ secrets.PUBLISH_OSSRH_USER }} server-password: ${{ secrets.PUBLISH_OSSRH_PASSWORD }} gpg-passphrase: ${{ secrets.PUBLISH_GPG_PASSWORD }} @@ -28,5 +28,5 @@ jobs: gpg_passphrase: ${{ secrets.PUBLISH_GPG_PASSWORD }} nexus_username: ${{ secrets.PUBLISH_OSSRH_USER }} nexus_password: ${{ secrets.PUBLISH_OSSRH_PASSWORD }} - maven_profiles: sonatype-oss-release + maven_profiles: sonatype-release maven_goals_phases: clean deploy -DskipTests=true diff --git a/common-actuator/common-actuator-client/pom.xml b/common-actuator/common-actuator-client/pom.xml index 21339c9..73f6541 100644 --- a/common-actuator/common-actuator-client/pom.xml +++ b/common-actuator/common-actuator-client/pom.xml @@ -4,7 +4,7 @@ common-actuator io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 common-actuator-client diff --git a/common-actuator/pom.xml b/common-actuator/pom.xml index 1ae7410..1778810 100644 --- a/common-actuator/pom.xml +++ b/common-actuator/pom.xml @@ -4,7 +4,7 @@ common-api io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 pom diff --git a/common-api-inject/pom.xml b/common-api-inject/pom.xml index d2e1daf..9bab261 100644 --- a/common-api-inject/pom.xml +++ b/common-api-inject/pom.xml @@ -4,7 +4,7 @@ common-api io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/common-core/pom.xml b/common-core/pom.xml index e7b67bc..025eacd 100644 --- a/common-core/pom.xml +++ b/common-core/pom.xml @@ -4,7 +4,7 @@ common-api io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/common-crypt/pom.xml b/common-crypt/pom.xml index 52c3ec8..ddc8293 100644 --- a/common-crypt/pom.xml +++ b/common-crypt/pom.xml @@ -4,7 +4,7 @@ common-api io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/common-database/database-common/pom.xml b/common-database/database-common/pom.xml index 70cab58..8cf7c94 100644 --- a/common-database/database-common/pom.xml +++ b/common-database/database-common/pom.xml @@ -4,7 +4,7 @@ common-database io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/common-database/database-mybatis-plus/pom.xml b/common-database/database-mybatis-plus/pom.xml index 51cb0ce..c3c1b31 100644 --- a/common-database/database-mybatis-plus/pom.xml +++ b/common-database/database-mybatis-plus/pom.xml @@ -4,7 +4,7 @@ common-database io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/common-database/database-mybatis/pom.xml b/common-database/database-mybatis/pom.xml index e9b6618..0fe866f 100644 --- a/common-database/database-mybatis/pom.xml +++ b/common-database/database-mybatis/pom.xml @@ -4,7 +4,7 @@ common-database io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/common-database/pom.xml b/common-database/pom.xml index 75fd50d..28acf8c 100644 --- a/common-database/pom.xml +++ b/common-database/pom.xml @@ -4,7 +4,7 @@ common-api io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 pom diff --git a/common-feign/pom.xml b/common-feign/pom.xml index 139544b..209ab99 100644 --- a/common-feign/pom.xml +++ b/common-feign/pom.xml @@ -4,7 +4,7 @@ common-api io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/common-http/pom.xml b/common-http/pom.xml index a6e9f59..f11210c 100644 --- a/common-http/pom.xml +++ b/common-http/pom.xml @@ -4,7 +4,7 @@ common-api io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/common-log/pom.xml b/common-log/pom.xml index 4674545..92a1f59 100644 --- a/common-log/pom.xml +++ b/common-log/pom.xml @@ -4,7 +4,7 @@ common-api io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/common-mq/common-mq-api/pom.xml b/common-mq/common-mq-api/pom.xml index 60b2cca..64b1c01 100644 --- a/common-mq/common-mq-api/pom.xml +++ b/common-mq/common-mq-api/pom.xml @@ -4,7 +4,7 @@ common-mq io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/common-mq/common-mq-receiver/pom.xml b/common-mq/common-mq-receiver/pom.xml index 5af184d..4566115 100644 --- a/common-mq/common-mq-receiver/pom.xml +++ b/common-mq/common-mq-receiver/pom.xml @@ -4,7 +4,7 @@ common-mq io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/common-mq/common-mq-sender/pom.xml b/common-mq/common-mq-sender/pom.xml index 413db01..3aa410a 100644 --- a/common-mq/common-mq-sender/pom.xml +++ b/common-mq/common-mq-sender/pom.xml @@ -4,7 +4,7 @@ common-mq io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 @@ -19,7 +19,7 @@ io.github.alice52 common-uid - 0.0.3 + 0.0.4 compile diff --git a/common-mq/pom.xml b/common-mq/pom.xml index af9b3fd..f2f3039 100644 --- a/common-mq/pom.xml +++ b/common-mq/pom.xml @@ -4,7 +4,7 @@ common-api io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 pom diff --git a/common-openapi/pom.xml b/common-openapi/pom.xml index 66d7cd1..9190601 100644 --- a/common-openapi/pom.xml +++ b/common-openapi/pom.xml @@ -4,7 +4,7 @@ common-api io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/common-oss/pom.xml b/common-oss/pom.xml index 8f7efb0..92beca9 100644 --- a/common-oss/pom.xml +++ b/common-oss/pom.xml @@ -4,7 +4,7 @@ common-api io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/common-redis/pom.xml b/common-redis/pom.xml index 1b6a6a2..e1a0122 100644 --- a/common-redis/pom.xml +++ b/common-redis/pom.xml @@ -4,7 +4,7 @@ common-api io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/common-security/pom.xml b/common-security/pom.xml index 2880cfb..cd0c945 100644 --- a/common-security/pom.xml +++ b/common-security/pom.xml @@ -4,7 +4,7 @@ common-api io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/common-swagger/pom.xml b/common-swagger/pom.xml index cc20e0d..58a6d4c 100644 --- a/common-swagger/pom.xml +++ b/common-swagger/pom.xml @@ -4,7 +4,7 @@ common-api io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 pom diff --git a/common-swagger/swagger-2/pom.xml b/common-swagger/swagger-2/pom.xml index 2a02180..81043c0 100644 --- a/common-swagger/swagger-2/pom.xml +++ b/common-swagger/swagger-2/pom.xml @@ -4,7 +4,7 @@ common-swagger io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/common-swagger/swagger-3/pom.xml b/common-swagger/swagger-3/pom.xml index ae4f468..2ca4a06 100644 --- a/common-swagger/swagger-3/pom.xml +++ b/common-swagger/swagger-3/pom.xml @@ -4,7 +4,7 @@ common-swagger io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/common-token/pom.xml b/common-token/pom.xml index 5770759..b3b0ed6 100644 --- a/common-token/pom.xml +++ b/common-token/pom.xml @@ -4,7 +4,7 @@ common-api io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/common-uid/pom.xml b/common-uid/pom.xml index 2567556..c5a592e 100644 --- a/common-uid/pom.xml +++ b/common-uid/pom.xml @@ -4,7 +4,7 @@ common-api io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/custom-test/Dockerfile b/custom-test/Dockerfile index 7480d1d..485d3e2 100644 --- a/custom-test/Dockerfile +++ b/custom-test/Dockerfile @@ -11,7 +11,7 @@ WORKDIR /${MODULE_NAME} EXPOSE 8080 -COPY target/${MODULE_NAME}-0.0.3.jar app.jar +COPY target/${MODULE_NAME}-0.0.4.jar app.jar RUN echo -e "#!/bin/sh\njava ${JAVA_OPTS} -Djava.awt.headless=true -Djava.security.egd=file:/dev/./urandom -DJASYPT_ENCRYPTOR_PASSWORD=${JASYPT_ENCRYPTOR_PASSWORD} -Dsun.net.httpserver.nodelay=true -jar ./app.jar" > ./entrypoint.sh RUN chmod +x ./entrypoint.sh diff --git a/custom-test/custom-common/pom.xml b/custom-test/custom-common/pom.xml index e239c15..c043182 100644 --- a/custom-test/custom-common/pom.xml +++ b/custom-test/custom-common/pom.xml @@ -4,7 +4,7 @@ custom-test io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/custom-test/custom-kotlin/pom.xml b/custom-test/custom-kotlin/pom.xml index b8d69f5..9d008f8 100644 --- a/custom-test/custom-kotlin/pom.xml +++ b/custom-test/custom-kotlin/pom.xml @@ -5,7 +5,7 @@ custom-test io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/custom-test/custom-oss/pom.xml b/custom-test/custom-oss/pom.xml index ee5d2fc..f7844a0 100644 --- a/custom-test/custom-oss/pom.xml +++ b/custom-test/custom-oss/pom.xml @@ -4,7 +4,7 @@ custom-test io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/custom-test/custom-syntax/pom.xml b/custom-test/custom-syntax/pom.xml index cb6f4e9..5697215 100644 --- a/custom-test/custom-syntax/pom.xml +++ b/custom-test/custom-syntax/pom.xml @@ -4,7 +4,7 @@ custom-test io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/custom-test/custom-test-crypt/pom.xml b/custom-test/custom-test-crypt/pom.xml index 3ed0ab8..3bf6f02 100644 --- a/custom-test/custom-test-crypt/pom.xml +++ b/custom-test/custom-test-crypt/pom.xml @@ -4,7 +4,7 @@ custom-test io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 custom-test-crypt diff --git a/custom-test/custom-test-database/pom.xml b/custom-test/custom-test-database/pom.xml index a76b8fe..1ab0cca 100644 --- a/custom-test/custom-test-database/pom.xml +++ b/custom-test/custom-test-database/pom.xml @@ -4,7 +4,7 @@ custom-test io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/custom-test/custom-test-http/pom.xml b/custom-test/custom-test-http/pom.xml index 97cfd37..e5480ee 100644 --- a/custom-test/custom-test-http/pom.xml +++ b/custom-test/custom-test-http/pom.xml @@ -4,7 +4,7 @@ custom-test io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/custom-test/custom-test-log/pom.xml b/custom-test/custom-test-log/pom.xml index a49f76a..75f9485 100644 --- a/custom-test/custom-test-log/pom.xml +++ b/custom-test/custom-test-log/pom.xml @@ -4,7 +4,7 @@ custom-test io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 custom-test-log diff --git a/custom-test/custom-test-mq/custom-test-mq-sender/pom.xml b/custom-test/custom-test-mq/custom-test-mq-sender/pom.xml index d5663c4..f9be1d2 100644 --- a/custom-test/custom-test-mq/custom-test-mq-sender/pom.xml +++ b/custom-test/custom-test-mq/custom-test-mq-sender/pom.xml @@ -4,7 +4,7 @@ custom-test-mq io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/custom-test/custom-test-mq/pom.xml b/custom-test/custom-test-mq/pom.xml index 6621504..110e102 100644 --- a/custom-test/custom-test-mq/pom.xml +++ b/custom-test/custom-test-mq/pom.xml @@ -4,7 +4,7 @@ custom-test io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 pom diff --git a/custom-test/custom-test-openapi/pom.xml b/custom-test/custom-test-openapi/pom.xml index 650c942..cab7027 100644 --- a/custom-test/custom-test-openapi/pom.xml +++ b/custom-test/custom-test-openapi/pom.xml @@ -4,7 +4,7 @@ custom-test io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/custom-test/custom-test-redis/pom.xml b/custom-test/custom-test-redis/pom.xml index cea5acc..6e0d6cc 100644 --- a/custom-test/custom-test-redis/pom.xml +++ b/custom-test/custom-test-redis/pom.xml @@ -4,7 +4,7 @@ custom-test io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/custom-test/custom-test-uid/pom.xml b/custom-test/custom-test-uid/pom.xml index 59a8b00..9f18cf2 100644 --- a/custom-test/custom-test-uid/pom.xml +++ b/custom-test/custom-test-uid/pom.xml @@ -4,7 +4,7 @@ custom-test io.github.alice52 - 0.0.3 + 0.0.4 4.0.0 diff --git a/custom-test/pom.xml b/custom-test/pom.xml index 55b7d8d..0b07076 100644 --- a/custom-test/pom.xml +++ b/custom-test/pom.xml @@ -4,7 +4,7 @@ io.github.alice52 common-api - 0.0.3 + 0.0.4 4.0.0 diff --git a/pom.xml b/pom.xml index c895c2f..b57e144 100644 --- a/pom.xml +++ b/pom.xml @@ -1,16 +1,11 @@ + xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.sonatype.oss - oss-parent - 7 - - io.github.alice52 common-api - 0.0.3 + 0.0.4 pom common-api @@ -45,7 +40,7 @@ official - 0.0.3 + 0.0.4 https://sonarcloud.io alice52 3.9.1.2184 @@ -113,7 +108,6 @@ - @@ -397,7 +391,6 @@ - @@ -654,7 +647,8 @@ - sonatype-oss-release + + sonatype-release [1.8,) @@ -676,6 +670,7 @@ org.apache.maven.plugins maven-javadoc-plugin + 2.10.4 @@ -709,6 +704,7 @@ 1.6.8 true + ossrh https://s01.oss.sonatype.org/ true @@ -726,16 +722,19 @@ sonatype-nexus-staging https://s01.oss.sonatype.org/content/repositories/snapshots/ + sonatype-nexus-snapshots Nexus Snapshot Repository https://oss.sonatype.org/content/repositories/snapshots - + diff --git a/pom.xml.dev b/pom.xml.dev index 88012aa..e44f6c9 100644 --- a/pom.xml.dev +++ b/pom.xml.dev @@ -10,7 +10,7 @@ common-api pom - 0.0.3 + 0.0.4 common-swagger