Skip to content

Commit

Permalink
remove spotless, does not work on java 8, ignore .yaml files in .gith…
Browse files Browse the repository at this point in the history
…ub (#5)

* remove spotless, does not work on java 8, ignore .yaml files in .github

* proper coverity url
  • Loading branch information
kortemik authored Jan 27, 2023
1 parent d91bfae commit 0d15bfb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 27 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/coverity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- name: Download Coverity
if: steps.cache_coverity.outputs.cache-hit != 'true'
run: |
wget --quiet https://scan.coverity.com/download/linux64 --post-data "token=${{ secrets.COVERITY_TOKEN }}&project=jlt_01" -O ${{ env.COVERITY }}.tgz
wget --quiet https://scan.coverity.com/download/linux64 --post-data "token=${{ secrets.COVERITY_TOKEN }}&project=teragrep%2Fjlt_01" -O ${{ env.COVERITY }}.tgz
mkdir -p ${{ env.COVERITY }}
tar zxvf ${{ env.COVERITY }}.tgz -C ${{ env.COVERITY }} --strip-components 1
Expand All @@ -64,4 +64,4 @@ jobs:
--form file=@jlt_01.tgz \
--form version="${GITHUB_REF##*/}" \
--form description="automated upload" \
https://scan.coverity.com/builds?project=jlt_01
https://scan.coverity.com/builds?project=teragrep%2Fjlt_01
26 changes: 1 addition & 25 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@
<exclude>.gitmodules</exclude>
<!-- ci -->
<exclude>.github/workflows/*.yml</exclude>
<exclude>.github/workflows/*.yaml</exclude>
<exclude>toolchains.xml</exclude>
<exclude>settings.xml</exclude>
<exclude>dependencies.settings.xml</exclude>
Expand Down Expand Up @@ -148,31 +149,6 @@
</compilerArgs>
</configuration>
</plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<configuration>
<java>
<!-- Temporarily disabled for JDK 16+ builds -->
<!--<removeUnusedImports/>-->
<replaceRegex>
<name>Remove wildcard imports</name>
<searchRegex>import\s+[^\*\s]+\*;(\r\n|\r|\n)</searchRegex>
<replacement>$1</replacement>
</replaceRegex>
</java>
</configuration>
<executions>
<execution>
<!-- Runs in compile phase to fail fast in case of formatting issues.-->
<id>spotless-check</id>
<phase>compile</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Expand Down

0 comments on commit 0d15bfb

Please sign in to comment.