Skip to content

Commit 3bee817

Browse files
committed
change ratchetFrom to origin/2.x
1 parent 5c30142 commit 3bee817

File tree

3 files changed

+22
-5
lines changed

3 files changed

+22
-5
lines changed

.github/workflows/build.yml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,24 @@ jobs:
6969
run: |
7070
./mvnw -T 4C clean test \
7171
-Dcheckstyle.skip=false -Dpmd.skip=false -Dlicense.skip=false -DredisCaseEnabled=true \
72-
-e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
72+
-e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn > mvn.log 2>&1 || {
73+
echo "## :negative_squared_cross_mark: Formatting issues found!" >> $GITHUB_STEP_SUMMARY
74+
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
75+
76+
ERROR_LINES=$(grep "ERROR" mvn.log | wc -l)
77+
78+
if [ "$ERROR_LINES" -gt 11 ]; then
79+
grep "ERROR" mvn.log | sed 's/Check if code needs formatting Check if code aligns with code style [0-9A-Z:.-]\+//' | sed 's/\[ERROR] //' | head -n -11 >> $GITHUB_STEP_SUMMARY
80+
else
81+
grep "ERROR" mvn.log | sed 's/Check if code needs formatting Check if code aligns with code style [0-9A-Z:.-]\+//' | sed 's/\[ERROR] //' >> $GITHUB_STEP_SUMMARY
82+
fi
83+
84+
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
85+
echo "Please run \`mvn spotless:apply\` to fix the formatting issues." >> $GITHUB_STEP_SUMMARY
86+
exit 1
87+
}
88+
89+
7390
# step 5.2
7491
- name: "Test with Maven and Java${{ matrix.java }}"
7592
if: matrix.java != '8'

integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/annotation/AspectTransactional.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ public class AspectTransactional {
3434
*/
3535
private String name = "";
3636

37+
// TODO revert changes after check the message
3738
/**
3839
* roll back for the Class
39-
*/
40-
private Class<? extends Throwable>[] rollbackFor = new Class[] {};
40+
*/private Class<? extends Throwable>[] rollbackFor = new Class[ ] {};
4141

4242
/**
4343
* roll back for the class name

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@
323323
<profile>
324324
<id>java11+</id>
325325
<activation>
326-
<jdk>[11,)</jdk>
326+
<jdk>[1.8,)</jdk>
327327
</activation>
328328
<build>
329329
<plugins>
@@ -340,7 +340,7 @@
340340
<exclude>**/antlr/mysql/antlr/*.*</exclude>
341341
<exclude>**/antlr/mysql/stream/ANTLRNoCaseStringStream.java</exclude>
342342
</excludes>
343-
<ratchetFrom>HEAD</ratchetFrom>
343+
<ratchetFrom>2.x</ratchetFrom>
344344
<palantirJavaFormat>
345345
<version>${palantirJavaFormat.version}</version>
346346
</palantirJavaFormat>

0 commit comments

Comments
 (0)