Skip to content

Commit ba28448

Browse files
committed
revert changes
1 parent 3bee817 commit ba28448

File tree

2 files changed

+3
-20
lines changed

2 files changed

+3
-20
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -69,24 +69,7 @@ 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 > 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-
72+
-e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
9073
# step 5.2
9174
- name: "Test with Maven and Java${{ matrix.java }}"
9275
if: matrix.java != '8'

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@
321321
</properties>
322322
</profile>
323323
<profile>
324-
<id>java11+</id>
324+
<id>java8+</id>
325325
<activation>
326326
<jdk>[1.8,)</jdk>
327327
</activation>
@@ -340,7 +340,7 @@
340340
<exclude>**/antlr/mysql/antlr/*.*</exclude>
341341
<exclude>**/antlr/mysql/stream/ANTLRNoCaseStringStream.java</exclude>
342342
</excludes>
343-
<ratchetFrom>2.x</ratchetFrom>
343+
<ratchetFrom>HEAD</ratchetFrom>
344344
<palantirJavaFormat>
345345
<version>${palantirJavaFormat.version}</version>
346346
</palantirJavaFormat>

0 commit comments

Comments
 (0)