Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refs #8431 - fix META-INF/services + travis check
- Loading branch information
Showing
8 changed files
with
62 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,4 +26,5 @@ | |
hs_err_pid* | ||
|
||
.idea | ||
*.iml | ||
target/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
#!/bin/bash | ||
|
||
|
||
# grep for \r in the templates | ||
grep -RUIl $'\r$' src/main/resources/* | ||
|
||
if [ $? -ne 1 ]; then | ||
echo "Templates contain carriage return '/r'. Please remove it and try again." | ||
exit 1; | ||
fi | ||
|
||
|
||
# grep for \r in the generators | ||
#grep -RUIl $'\r$' modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/*.java | ||
find src/main/java/ -type f -iname "*.java" -exec grep -RUIl $'\r$' {} \; | wc -l | ||
|
||
if [ $? -ne 0 ]; then | ||
echo "Generators contain carriage return '/r'. Please remove it and try again." | ||
exit 1; | ||
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
#!/bin/bash | ||
|
||
# grep for '<<<<<<< HEAD' | ||
grep -RUIl '<<<<<<< HEAD' src | ||
|
||
if [ $? -ne 1 ]; then | ||
echo "src contain merge conflicts '<<<<<<< HEAD'. Please remove it and try again." | ||
exit 1; | ||
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
#!/bin/bash | ||
|
||
# grep for \t in the generators | ||
RESULT=`find src/ -name "*.java" | xargs grep $'\t'` | ||
|
||
echo -e "$RESULT" | ||
|
||
if [ "$RESULT" != "" ]; then | ||
echo "Java files contain tab '\\t'. Please remove it and try again." | ||
exit 1; | ||
fi | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.