Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

boot 3.2.2, wings 110ss #197

Merged
merged 2 commits into from
Jan 31, 2024
Merged

boot 3.2.2, wings 110ss #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83299c7
⬆️ boot 3.2.2, wings 110ss
trydofor Jan 30, 2024
025e0fc
✅ auto dryrun if no email prop #196
trydofor Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 23 additions & 19 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Release-To-OssRh
run-name: Release ${{github.ref_name}} by @${{ github.event_name }}
run-name: Release ${{ github.ref_name }} by @${{ github.event_name }}

on:
workflow_dispatch:
Expand Down Expand Up @@ -30,18 +30,20 @@ on:
required: false
release:
types: [published]

push:
branches:
- 'main'
jobs:
release:
name: Release to Sonatype
runs-on: ubuntu-latest
env:
MAVEN_OPTS: -Xmx2g
LOG_LEVEL: ${{ inputs.testLoggerLevel }}
LOG_LEVEL: ${{ inputs.testLoggerLevel || 'INFO' }}
TEST_VERBOSE: ${{ inputs.testLoggerLevel == 'DEBUG' }}

steps:
- name: Checkout ${{github.event.release.tag_name}}
- name: Checkout ${{ github.event.release.tag_name }}
uses: actions/checkout@v4
with:
fetch-depth: 10
Expand All @@ -54,13 +56,13 @@ jobs:
path: |
~/.asdf/
~/.m2/repository/
key: asdf-m2-repo-${{hashFiles('.tool-versions')}}
key: asdf-m2-repo-${{ hashFiles('pom.xml') }}

## install jdk and maven
- name: Install asdf & tools
uses: asdf-vm/actions/install@v3
with:
skip_install: ${{steps.cache-sdk-repo.outputs.cache-hit == 'true'}}
skip_install: ${{ steps.cache-sdk-repo.outputs.cache-hit == 'true' }}

## write settings.xml
- name: Maven settings.xml
Expand All @@ -73,16 +75,21 @@ jobs:
_opt=$(git describe --tags --exact-match 2>/dev/null || true)
if [ "$_opt" != "" ]; then
_opt="-Drevision=$_opt"
echo $_opt
echo "MVN_REVISION=$_opt"
echo "MVN_REVISION=$_opt" >> "$GITHUB_OUTPUT"
fi

_ver=$(mvn --quiet --non-recursive -DforceStdout -Dexpression=project.version $_opt help:evaluate)
echo $_ver
echo "WINGS_VERSION=$_ver"
echo "WINGS_VERSION=$_ver" >> "$GITHUB_OUTPUT"

echo "MVN_COVERAGE=${{ inputs.testCoverReport || github.event_name == 'release' }}" >> "$GITHUB_OUTPUT"
echo "MVN_DEPLOYRH=${{ inputs.deployOssrh || github.event_name == 'release' }}" >> "$GITHUB_OUTPUT"
_cov=${{ inputs.testCoverReport || github.event_name == 'push' }}
echo "MVN_COVERAGE=$_cov"
echo "MVN_COVERAGE=$_cov" >> "$GITHUB_OUTPUT"

_drh=${{ inputs.deployOssrh || github.event_name == 'release' }}
echo "MVN_DEPLOYRH=$_drh"
echo "MVN_DEPLOYRH=$_drh" >> "$GITHUB_OUTPUT"

mvn -v
git --no-pager log --graph -10 --pretty=format:'%H - %ai %d %s'
Expand All @@ -103,32 +110,29 @@ jobs:

## report if not release
- name: Test Coverage ${{ steps.settings.outputs.WINGS_VERSION }} ${{ steps.settings.outputs.GIT_BRANCH }}
if: steps.settings.outputs.MVN_COVERAGE
if: steps.settings.outputs.MVN_COVERAGE == 'true'
run: |
mvn -pl ':devs-codegen' -am -Ddevs-codegen.test.skip=false -Ddevs-initdb=true -Dwings.test.skip=true clean test
mvn -P 'coverage,!example' -Dmaven.test.failure.ignore=${{ inputs.testFailureIgnore }} clean test
mvn -P '!example,!devs' -Dmaven.test.skip=true clean install
mvn -pl ':devs-codegen' -Ddevs-initdb=true clean test
mvn -P 'coverage,!example,!devs' -Dmaven.test.failure.ignore=${{ inputs.testFailureIgnore }} test
mvn -pl ':devs-coverage' -am jacoco:report-aggregate
mvn -pl ':devs-coverage' -DrepoToken=$COVERALLS_WINGS verify
env:
TZ: Asia/Shanghai
JAVA_HOME: ${{ steps.settings.outputs.JAVA_HOME }}
MAIL_USER: ${{ secrets.MAIL_USER }}
MAIL_PASS: ${{ secrets.MAIL_PASS }}
MAIL_FROM: ${{ secrets.MAIL_FROM }}
MAIL_TO: ${{ secrets.MAIL_TO }}
COVERALLS_WINGS: ${{ secrets.COVERALLS_REPO_TOKEN }}

## import gpp private key
- name: Import GPG key
if: steps.settings.outputs.MVN_DEPLOYRH
if: steps.settings.outputs.MVN_DEPLOYRH == 'true'
uses: crazy-max/ghaction-import-gpg@v6
with:
gpg_private_key: ${{ secrets.MVN_GPG_SKEY }}
passphrase: ${{ secrets.MVN_GPG_PASS }}

## maven deploy
- name: Deploy ${{ steps.settings.outputs.WINGS_VERSION }} ${{ steps.settings.outputs.GIT_BRANCH }}
if: steps.settings.outputs.MVN_DEPLOYRH
if: steps.settings.outputs.MVN_DEPLOYRH == 'true'
run: >
mvn
-P 'ossrh,doc,!example,!devs'
Expand Down
2 changes: 1 addition & 1 deletion observe/docs
Open in desktop
Submodule docs updated 13 files
+ − src/.vuepress/public/team_ar.png
+ − src/.vuepress/public/team_lgd.png
+ − src/.vuepress/public/team_spirit.png
+ − src/.vuepress/public/team_tundra.png
+ − src/.vuepress/public/team_wings.png
+11 −6 src/0-wings/0f-qa-others.md
+2 −2 src/0-wings/README.md
+13 −4 src/9-example/9a.wings-change/9a0.notable.md
+1 −1 src/9-example/9a.wings-change/9a5.306-300.md
+6 −4 src/9-example/9a.wings-change/9a6.3-2-100.md
+2 −2 src/zh/0-wings/README.md
+1 −1 src/zh/9-example/9a.wings-change/9a5.306-300.md
+7 −5 src/zh/9-example/9a.wings-change/9a6.3-2-100.md
2 changes: 1 addition & 1 deletion observe/meepo
Open in desktop
Submodule meepo updated from 55a1fd to 7c961c
2 changes: 1 addition & 1 deletion observe/mirana
Open in desktop
Submodule mirana updated from 2991b2 to 4d0713
34 changes: 19 additions & 15 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,20 @@

<properties>
<!-- https://maven.apache.org/maven-ci-friendly.html -->
<revision>3.2.101-SNAPSHOT</revision>
<!-- https://docs.spring.io/spring-boot/docs/3.2.1/reference/html/dependency-versions.html -->
<spring-boot.version>3.2.1</spring-boot.version>
<revision>3.2.110-SNAPSHOT</revision>
<!-- https://docs.spring.io/spring-boot/docs/current/reference/html/dependency-versions.html -->
<spring-boot.version>3.2.2</spring-boot.version>
<wings.version>${revision}</wings.version>
<!--suppress UnresolvedMavenProperty fulfill by directory-maven-plugin -->
<wings.rootdir>${highest-basedir}</wings.rootdir>
<!-- project -->
<java.version>21</java.version>
<!-- <kotlin.version>1.9.21</kotlin.version> -->
<!-- mvn boot -->
<wings.test.skip>false</wings.test.skip>
<spring-boot.repackage.skip>true</spring-boot.repackage.skip>
<spring-boot.repackage.executable>false</spring-boot.repackage.executable>
<!-- common quality checker: jetbrains/findbugs-jsr305(guava)/errorprone(guava) -->
<annotations.version>24.0.1</annotations.version> <!-- https://github.com/JetBrains/java-annotations/releases -->
<annotations.version>24.1.0</annotations.version> <!-- https://github.com/JetBrains/java-annotations/releases -->
<!-- common utils-->
<mapstruct.version>1.5.5.Final</mapstruct.version> <!-- https://github.com/mapstruct/mapstruct/releases -->
<guava.version>33.0.0-jre</guava.version> <!-- https://github.com/google/guava/releases/ -->
Expand All @@ -44,29 +43,30 @@
<commons-text.version>1.11.0</commons-text.version> <!-- https://commons.apache.org/proper/commons-text/ -->
<joda-convert.version>2.2.3</joda-convert.version> <!-- https://github.com/JodaOrg/joda-convert/releases -->
<!-- wings project -->
<mirana.version>2.6.4</mirana.version> <!-- https://github.com/trydofor/pro.fessional.mirana -->
<meepo.version>1.5.0</meepo.version> <!-- https://github.com/trydofor/pro.fessional.meepo -->
<mirana.version>2.6.5</mirana.version> <!-- https://github.com/trydofor/pro.fessional.mirana -->
<meepo.version>1.5.1</meepo.version> <!-- https://github.com/trydofor/pro.fessional.meepo -->
<kaptcha.version>2.3.3</kaptcha.version> <!-- https://github.com/trydofor/kaptcha -->
<fastjson2.version>2.0.44</fastjson2.version> <!-- https://github.com/alibaba/fastjson2/releases -->
<fastjson2.version>2.0.46</fastjson2.version> <!-- https://github.com/alibaba/fastjson2/releases -->
<fastjson.version>${fastjson2.version}</fastjson.version> <!-- https://github.com/alibaba/fastjson/releases -->
<kryo.version>5.5.0</kryo.version> <!-- https://github.com/EsotericSoftware/kryo/releases -->
<transmittable.version>2.14.4</transmittable.version> <!-- https://github.com/alibaba/transmittable-thread-local/releases -->
<kryo.version>5.6.0</kryo.version> <!-- https://github.com/EsotericSoftware/kryo/releases -->
<transmittable.version>2.14.5</transmittable.version> <!-- https://github.com/alibaba/transmittable-thread-local/releases -->
<bouncycastle.version>1.77</bouncycastle.version> <!-- https://bouncycastle.org/releasenotes.html -->
<justauth.version>1.16.6</justauth.version> <!-- https://github.com/justauth/JustAuth/releases -->
<!-- sharding jdbc -->
<shardingsphere.version>5.4.1</shardingsphere.version> <!-- https://github.com/apache/shardingsphere/releases -->
<!-- servicecomb -->
<servicecomb.version>3.0.0</servicecomb.version> <!-- https://github.com/apache/servicecomb-java-chassis/releases -->
<servicecomb.version>3.0.1</servicecomb.version> <!-- https://github.com/apache/servicecomb-java-chassis/releases -->
<!-- others -->
<springdoc.version>2.3.0</springdoc.version> <!-- https://github.com/springdoc/springdoc-openapi/releases -->
<boot-admin.version>3.2.0</boot-admin.version> <!-- https://github.com/codecentric/spring-boot-admin/releases -->
<sentry.version>7.1.0</sentry.version> <!-- https://github.com/getsentry/sentry-java/releases buildSrc/src/main/java/Config.kt -->
<boot-admin.version>3.2.1</boot-admin.version> <!-- https://github.com/codecentric/spring-boot-admin/releases -->
<sentry.version>7.2.0</sentry.version> <!-- https://github.com/getsentry/sentry-java/releases buildSrc/src/main/java/Config.kt -->
<retrofit.version>2.9.0</retrofit.version> <!-- https://github.com/square/retrofit/tags -->
<allure.version>2.25.0</allure.version> <!-- https://github.com/allure-framework/allure-java/releases -->
<druid.version>1.2.20</druid.version> <!-- https://github.com/alibaba/druid/releases -->
<druid.version>1.2.21</druid.version> <!-- https://github.com/alibaba/druid/releases -->
<!-- mvn-build-plugin -->
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version> <!-- https://github.com/mojohaus/flatten-maven-plugin/releases -->
<directory-maven-plugin.version>1.0</directory-maven-plugin.version> <!-- https://github.com/jdcasey/directory-maven-plugin -->
<versions-maven-plugin.version>2.16.2</versions-maven-plugin.version> <!-- https://www.mojohaus.org/versions/versions-maven-plugin -->
<maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version> <!-- https://github.com/apache/maven-gpg-plugin/tags -->
<nexus-staging-plugin.version>1.6.13</nexus-staging-plugin.version> <!-- https://github.com/sonatype/nexus-maven-plugins/tree/main/staging/maven-plugin -->
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version> <!-- https://github.com/hazendaz/coveralls-maven-plugin -->
Expand Down Expand Up @@ -532,7 +532,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<skip>${wings.test.skip}</skip>
<environmentVariables>
<WINGS_ROOTDIR>${wings.rootdir}</WINGS_ROOTDIR>
</environmentVariables>
Expand Down Expand Up @@ -812,6 +811,11 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>${versions-maven-plugin.version}</version>
</plugin>
<!-- kotlin -->
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
Expand Down
14 changes: 0 additions & 14 deletions radiant/devs-codegen/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<description>generate the wings auto-gen code automatically</description>

<properties>
<devs-codegen.test.skip>true</devs-codegen.test.skip>
<maven.deploy.skip>true</maven.deploy.skip>
<maven.install.skip>true</maven.install.skip>
</properties>
Expand All @@ -31,17 +30,4 @@
<artifactId>testing-faceless</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<skip>${devs-codegen.test.skip}</skip>
</configuration>
</plugin>

</plugins>
</build>
</project>
19 changes: 0 additions & 19 deletions radiant/devs-coverage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,97 +24,78 @@
<dependency>
<groupId>pro.fessional.wings</groupId>
<artifactId>silencer</artifactId>
<version>${wings.version}</version>
</dependency>
<dependency>
<groupId>pro.fessional.wings</groupId>
<artifactId>silencer-curse</artifactId>
<version>${wings.version}</version>
</dependency>
<dependency>
<groupId>pro.fessional.wings</groupId>
<artifactId>silencer-jaxb</artifactId>
<version>${wings.version}</version>
</dependency>
<dependency>
<groupId>pro.fessional.wings</groupId>
<artifactId>faceless</artifactId>
<version>${wings.version}</version>
</dependency>
<dependency>
<groupId>pro.fessional.wings</groupId>
<artifactId>faceless-awesome</artifactId>
<version>${wings.version}</version>
</dependency>
<dependency>
<groupId>pro.fessional.wings</groupId>
<artifactId>faceless-flywave</artifactId>
<version>${wings.version}</version>
</dependency>
<dependency>
<groupId>pro.fessional.wings</groupId>
<artifactId>faceless-jooq</artifactId>
<version>${wings.version}</version>
</dependency>
<dependency>
<groupId>pro.fessional.wings</groupId>
<artifactId>faceless-shard</artifactId>
<version>${wings.version}</version>
</dependency>
<dependency>
<groupId>pro.fessional.wings</groupId>
<artifactId>slardar</artifactId>
<version>${wings.version}</version>
</dependency>
<dependency>
<groupId>pro.fessional.wings</groupId>
<artifactId>slardar-hazel-caching</artifactId>
<version>${wings.version}</version>
</dependency>
<dependency>
<groupId>pro.fessional.wings</groupId>
<artifactId>slardar-hazel-session</artifactId>
<version>${wings.version}</version>
</dependency>
<dependency>
<groupId>pro.fessional.wings</groupId>
<artifactId>slardar-sprint</artifactId>
<version>${wings.version}</version>
</dependency>
<dependency>
<groupId>pro.fessional.wings</groupId>
<artifactId>slardar-webmvc</artifactId>
<version>${wings.version}</version>
</dependency>
<dependency>
<groupId>pro.fessional.wings</groupId>
<artifactId>warlock</artifactId>
<version>${wings.version}</version>
</dependency>
<dependency>
<groupId>pro.fessional.wings</groupId>
<artifactId>warlock-awesome</artifactId>
<version>${wings.version}</version>
</dependency>
<dependency>
<groupId>pro.fessional.wings</groupId>
<artifactId>warlock-bond</artifactId>
<version>${wings.version}</version>
</dependency>
<dependency>
<groupId>pro.fessional.wings</groupId>
<artifactId>warlock-shadow</artifactId>
<version>${wings.version}</version>
</dependency>
<dependency>
<groupId>pro.fessional.wings</groupId>
<artifactId>tiny-mail</artifactId>
<version>${wings.version}</version>
</dependency>
<dependency>
<groupId>pro.fessional.wings</groupId>
<artifactId>tiny-task</artifactId>
<version>${wings.version}</version>
</dependency>
</dependencies>
<build>
Expand Down
Loading