Skip to content

Commit 486dda8

Browse files
authored
Merge pull request #606 from hazendaz/spotbugs
Automate license application and remove few items no longer necessary from pom
2 parents 9b26eb1 + 6be7a27 commit 486dda8

File tree

351 files changed

+3573
-457
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

351 files changed

+3573
-457
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
java-version: ${{ matrix.java }}
2222
distribution: 'zulu'
2323
- name: Test with Maven
24-
run: ./mvnw test -B -V --no-transfer-progress
24+
run: ./mvnw test -B -V --no-transfer-progress -D"license.skip=true"

.github/workflows/coveralls.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ jobs:
1212
uses: actions/setup-java@v3
1313
with:
1414
java-version: 17
15-
distribution: 'zulu'
15+
distribution: zulu
1616
- name: Report Coverage to Coveralls for Pull Requests
1717
if: github.event_name == 'pull_request'
18-
run: ./mvnw -B -V test jacoco:report coveralls:report -q -D"license.skip=true" -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER --no-transfer-progress
18+
run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER --no-transfer-progress
1919
env:
2020
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2121
PR_NUMBER: ${{ github.event.number }}
2222
- name: Report Coverage to Coveralls for General Push
2323
if: github.event_name == 'push'
24-
run: ./mvnw -B -V test jacoco:report coveralls:report -q -D"license.skip=true" -DrepoToken=$GITHUB_TOKEN -DserviceName=github
24+
run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github
2525
env:
2626
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/coverity.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
run: |
2121
wget -q https://scan.coverity.com/download/linux64 --post-data "token=$COVERITY_TOKEN&project=spotbugs%2Fspotbugs-maven-plugin" -O coverity_tool.tgz
2222
tar -xf coverity_tool.tgz
23-
./cov-analysis-linux64-*/bin/cov-build --dir cov-int ./mvnw -B -V -DskipTests=true verify --no-transfer-progress
23+
./cov-analysis-linux64-*/bin/cov-build --dir cov-int ./mvnw -B -V -DskipTests=true -Dlicense.skip=true verify --no-transfer-progress
2424
tar czvf spotbugs-maven-plugin.tgz cov-int
2525
curl --form token=$COVERITY_TOKEN \
2626
--form email=$EMAIL \

.github/workflows/it-maven-3.3.9.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
uses: actions/setup-java@v3
1414
with:
1515
java-version: 17
16-
distribution: 'zulu'
16+
distribution: zulu
1717
- name: Load Maven 3.3.9
1818
run: ./mvnw -B -V org.apache.maven.plugins:maven-wrapper-plugin:3.2.0:wrapper -Dmaven=3.3.9 --no-transfer-progress
1919
- name: Build Setup
20-
run: ./mvnw -B -V clean install -Dmaven.min-version=3.3.9
20+
run: ./mvnw -B -V clean install -Dlicense.skip=true -Dmaven.min-version=3.3.9
2121
- name: Integration Test with Maven
22-
run: ./mvnw -B -V -DtestSrc=remote -Prun-its clean install -Dinvoker.parallelThreads=4 -Dmaven.min-version=3.3.9
22+
run: ./mvnw -B -V -DtestSrc=remote -Prun-its clean install -Dinvoker.parallelThreads=4 -Dlicense.skip=true -Dmaven.min-version=3.3.9

.github/workflows/it-maven-4.0.0.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
uses: actions/setup-java@v3
1414
with:
1515
java-version: 17
16-
distribution: 'zulu'
16+
distribution: zulu
1717
- name: Load Maven 4.0.0-alpha-5
1818
run: ./mvnw -B -V org.apache.maven.plugins:maven-wrapper-plugin:3.2.0:wrapper -Dmaven=4.0.0-alpha-5 --no-transfer-progress
1919
- name: Build Setup
20-
run: ./mvnw -B -V clean install -Dmaven.min-version=4.0.0-alpha-5
20+
run: ./mvnw -B -V clean install -Dlicense.skip=true -Dmaven.min-version=4.0.0-alpha-5 --no-transfer-progress
2121
- name: Integration Test with Maven
22-
run: ./mvnw -B -V -DtestSrc=remote -Prun-its clean install -Dinvoker.parallelThreads=4 -Dmaven.min-version=4.0.0-alpha-5
22+
run: ./mvnw -B -V -DtestSrc=remote -Prun-its clean install -Dinvoker.parallelThreads=4 -Dlicense.skip=true -Dmaven.min-version=4.0.0-alpha-5 --no-transfer-progress

.github/workflows/it.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
uses: actions/setup-java@v3
1414
with:
1515
java-version: 17
16-
distribution: 'zulu'
16+
distribution: zulu
1717
- name: Build Setup
18-
run: ./mvnw -B -V clean install --no-transfer-progress
18+
run: ./mvnw -B -V clean install -Dlicense.skip=true --no-transfer-progress
1919
- name: Integration Test with Maven
20-
run: ./mvnw -B -V -DtestSrc=remote -Prun-its clean install -Dinvoker.parallelThreads=4 --no-transfer-progress
20+
run: ./mvnw -B -V -DtestSrc=remote -Prun-its clean install -Dinvoker.parallelThreads=4 -Dlicense.skip=true --no-transfer-progress

.github/workflows/site.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
with:
2121
ssh-private-key: ${{ secrets.DEPLOY_KEY }}
2222
- name: Build site
23-
run: ./mvnw site site:stage -DskipTests -B -V --no-transfer-progress
23+
run: ./mvnw site site:stage -DskipTests -Dlicense.skip=true -B -V --no-transfer-progress
2424
env:
2525
CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
2626
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sonar.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
uses: actions/setup-java@v3
1919
with:
2020
java-version: 17
21-
distribution: 'zulu'
21+
distribution: zulu
2222
- name: Analyze with SonarCloud
23-
run: ./mvnw verify sonar:sonar -B -V -D"sonar.projectKey=spotbugs_spotbugs-maven-plugin" -D"sonar.organization=spotbugs" -D"sonar.host.url=https://sonarcloud.io" -D"sonar.login=$SONAR_TOKEN" --no-transfer-progress
23+
run: ./mvnw verify sonar:sonar -B -V -Dsonar.projectKey=spotbugs_spotbugs-maven-plugin -Dsonar.organization=spotbugs -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true --no-transfer-progress
2424
env:
2525
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2626
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/sonatype.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
java-version: 17
1818
distribution: 'zulu'
1919
- name: Deploy to Sonatype
20-
run: ./mvnw deploy -DskipTests -B -V --no-transfer-progress --settings ./.mvn/settings.xml
20+
run: ./mvnw deploy -DskipTests -B -V --no-transfer-progress --settings ./.mvn/settings.xml -Dlicense.skip=true
2121
env:
2222
CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
2323
CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}

.mvn/extensions.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Copyright 2005-2023 the original author or authors.
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
https://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
18+
-->
219
<extensions>
320
<extension>
421
<groupId>fr.jcgay.maven</groupId>

0 commit comments

Comments
 (0)