Skip to content

Commit

Permalink
Merge branch 'release/2.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
conifercone committed Dec 14, 2024
2 parents 79d86fe + 920775e commit 283b190
Show file tree
Hide file tree
Showing 421 changed files with 6,236 additions and 2,786 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/checkstyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0

- name: Checkstyle with Gradle Wrapper
run: ./gradlew checkstyleMain --parallel --build-cache
run: ./gradlew checkstyleMain
continue-on-error: true
- name: Upload Checkstyle Reports
uses: actions/upload-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pmd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0

- name: PMD with Gradle Wrapper
run: ./gradlew pmdMain --parallel --build-cache
run: ./gradlew pmdMain
continue-on-error: true
- name: Upload PMD Reports
uses: actions/upload-artifact@v4
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
HELP.md
.gradle
build-cache
build/
!gradle/wrapper/gradle-wrapper.jar
!**/src/main/**/build/
Expand Down
2 changes: 1 addition & 1 deletion .run/MuMuAuthenticationApplication-dev.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<option name="SPRING_BOOT_MAIN_CLASS"
value="baby.mumu.authentication.MuMuAuthenticationApplication"/>
<option name="VM_PARAMETERS"
value="-Dcom.sun.management.jmxremote.port=31101 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dlog4j2.disableJmx=true"/>
value="-Dcom.sun.management.jmxremote.port=31101 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"/>
<method v="2">
<option name="Make" enabled="true"/>
</method>
Expand Down
2 changes: 1 addition & 1 deletion .run/MuMuFileApplication-dev.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<option name="SHORTEN_COMMAND_LINE" value="ARGS_FILE"/>
<option name="SPRING_BOOT_MAIN_CLASS" value="baby.mumu.file.MuMuFileApplication"/>
<option name="VM_PARAMETERS"
value="-Dcom.sun.management.jmxremote.port=31501 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dlog4j2.disableJmx=true"/>
value="-Dcom.sun.management.jmxremote.port=31501 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"/>
<method v="2">
<option name="Make" enabled="true"/>
</method>
Expand Down
2 changes: 1 addition & 1 deletion .run/MuMuLogApplication-dev.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<option name="SHORTEN_COMMAND_LINE" value="ARGS_FILE"/>
<option name="SPRING_BOOT_MAIN_CLASS" value="baby.mumu.log.MuMuLogApplication"/>
<option name="VM_PARAMETERS"
value="-Dcom.sun.management.jmxremote.port=31201 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dlog4j2.disableJmx=true"/>
value="-Dcom.sun.management.jmxremote.port=31201 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"/>
<extension name="coverage">
<pattern>
<option name="PATTERN" value="baby.mumu.log.*"/>
Expand Down
2 changes: 1 addition & 1 deletion .run/MuMuMailApplication-dev.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<option name="SHORTEN_COMMAND_LINE" value="ARGS_FILE"/>
<option name="SPRING_BOOT_MAIN_CLASS" value="baby.mumu.mail.MuMuMailApplication"/>
<option name="VM_PARAMETERS"
value="-Dcom.sun.management.jmxremote.port=31401 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dlog4j2.disableJmx=true"/>
value="-Dcom.sun.management.jmxremote.port=31401 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"/>
<method v="2">
<option name="Make" enabled="true"/>
</method>
Expand Down
2 changes: 1 addition & 1 deletion .run/MuMuMessageApplication-dev.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<option name="SHORTEN_COMMAND_LINE" value="ARGS_FILE"/>
<option name="SPRING_BOOT_MAIN_CLASS" value="baby.mumu.message.MuMuMessageApplication"/>
<option name="VM_PARAMETERS"
value="-Dcom.sun.management.jmxremote.port=31701 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dlog4j2.disableJmx=true"/>
value="-Dcom.sun.management.jmxremote.port=31701 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"/>
<method v="2">
<option name="Make" enabled="true"/>
</method>
Expand Down
2 changes: 1 addition & 1 deletion .run/MuMuSmsApplication-dev.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<option name="SHORTEN_COMMAND_LINE" value="ARGS_FILE"/>
<option name="SPRING_BOOT_MAIN_CLASS" value="baby.mumu.sms.MuMuSmsApplication"/>
<option name="VM_PARAMETERS"
value="-Dcom.sun.management.jmxremote.port=31601 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dlog4j2.disableJmx=true"/>
value="-Dcom.sun.management.jmxremote.port=31601 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"/>
<extension name="coverage">
<pattern>
<option name="PATTERN" value="baby.mumu.sms.*"/>
Expand Down
2 changes: 1 addition & 1 deletion .run/MuMuUniqueApplication-dev.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<option name="SHORTEN_COMMAND_LINE" value="ARGS_FILE"/>
<option name="SPRING_BOOT_MAIN_CLASS" value="baby.mumu.unique.MuMuUniqueApplication"/>
<option name="VM_PARAMETERS"
value="-Dcom.sun.management.jmxremote.port=31301 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dlog4j2.disableJmx=true"/>
value="-Dcom.sun.management.jmxremote.port=31301 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"/>
<method v="2">
<option name="Make" enabled="true"/>
</method>
Expand Down
Loading

0 comments on commit 283b190

Please sign in to comment.