From 89a90bdc5fd77a4ac0ad1067160a85b2f5d363cd Mon Sep 17 00:00:00 2001 From: iosmanthus Date: Mon, 10 Jan 2022 17:05:16 +0800 Subject: [PATCH 1/7] add maven site with spotbugs Signed-off-by: iosmanthus --- pom.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++ spotbugs-include.xml | 9 +++++++++ 2 files changed, 55 insertions(+) create mode 100644 spotbugs-include.xml diff --git a/pom.xml b/pom.xml index efd8cb7033e..08fa8e201ab 100644 --- a/pom.xml +++ b/pom.xml @@ -243,6 +243,29 @@ 0.10.0 + + + + + com.github.spotbugs + spotbugs-maven-plugin + 4.5.2.0 + + true + + target/site + spotbugs-include.xml + + + + org.apache.maven.plugins + maven-jxr-plugin + 3.1.1 + + + + + @@ -587,6 +610,29 @@ maven-surefire-plugin 3.0.0-M5 + + org.apache.maven.plugins + maven-site-plugin + 3.7.1 + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 3.0.0 + + + com.github.spotbugs + spotbugs-maven-plugin + 4.5.2.0 + + + + com.github.spotbugs + spotbugs + 4.5.3 + + + diff --git a/spotbugs-include.xml b/spotbugs-include.xml new file mode 100644 index 00000000000..53d46131763 --- /dev/null +++ b/spotbugs-include.xml @@ -0,0 +1,9 @@ + + + + + + + + + From cb3edf321f7cc45501a13534d67f9e63aba31543 Mon Sep 17 00:00:00 2001 From: iosmanthus Date: Tue, 11 Jan 2022 14:01:50 +0800 Subject: [PATCH 2/7] ignore license checker for spotsbug-include.xml Signed-off-by: iosmanthus --- .github/license-checker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/license-checker.yml b/.github/license-checker.yml index d1b115d213c..e1c07571991 100644 --- a/.github/license-checker.yml +++ b/.github/license-checker.yml @@ -11,6 +11,7 @@ header: - 'LICENSE' - 'Makefile' - 'pom.xml' + 'spotbugs-include.xml' - 'shell.nix' - '.ci/' - '.gitignore' From 0a5f56c8373e29deee9f2371119fc6d9ad18163f Mon Sep 17 00:00:00 2001 From: iosmanthus Date: Tue, 11 Jan 2022 15:25:51 +0800 Subject: [PATCH 3/7] build site in github action Signed-off-by: iosmanthus --- .github/workflows/gh-pages.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index e6b3649aaed..c840b8ac4cd 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -27,8 +27,8 @@ jobs: java-version: '8' distribution: 'adopt' - - name: Javadoc - run: mvn clean javadoc:javadoc -Djavadoc.skip=false && mv ./target/site/apidocs ./docs/book/apidocs + - name: Maven site + run: mvn clean compile site && mv ./target/site ./docs/book/site - name: Deploy uses: peaceiris/actions-gh-pages@v3 From a03b41b63592d497119442baf7fe93226f87bf9a Mon Sep 17 00:00:00 2001 From: iosmanthus Date: Tue, 11 Jan 2022 15:32:07 +0800 Subject: [PATCH 4/7] fix license error Signed-off-by: iosmanthus --- .github/license-checker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/license-checker.yml b/.github/license-checker.yml index e1c07571991..32b1185cb1b 100644 --- a/.github/license-checker.yml +++ b/.github/license-checker.yml @@ -11,7 +11,7 @@ header: - 'LICENSE' - 'Makefile' - 'pom.xml' - 'spotbugs-include.xml' + - 'spotbugs-include.xml' - 'shell.nix' - '.ci/' - '.gitignore' From aa7e2999048cf6d3aaeb0701d6ee92c06e3f3c94 Mon Sep 17 00:00:00 2001 From: iosmanthus Date: Thu, 20 Jan 2022 14:27:59 +0800 Subject: [PATCH 5/7] move spotbugs-include.xml to dev/ Signed-off-by: iosmanthus --- spotbugs-include.xml => dev/spotbugs-include.xml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename spotbugs-include.xml => dev/spotbugs-include.xml (100%) diff --git a/spotbugs-include.xml b/dev/spotbugs-include.xml similarity index 100% rename from spotbugs-include.xml rename to dev/spotbugs-include.xml From 9df7560f9f7be9cc8b6f47dd7a57546c5fa64a21 Mon Sep 17 00:00:00 2001 From: iosmanthus Date: Thu, 20 Jan 2022 17:11:24 +0800 Subject: [PATCH 6/7] update pom.xml Signed-off-by: iosmanthus --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 08fa8e201ab..01733e4dfed 100644 --- a/pom.xml +++ b/pom.xml @@ -254,7 +254,7 @@ true target/site - spotbugs-include.xml + dev/spotbugs-include.xml From a7e172c74e34e7037fd8d20a4abfe6e12121a80a Mon Sep 17 00:00:00 2001 From: iosmanthus Date: Wed, 9 Feb 2022 13:42:29 +0800 Subject: [PATCH 7/7] remove license-checker for moved file Signed-off-by: iosmanthus --- .github/license-checker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/license-checker.yml b/.github/license-checker.yml index 32b1185cb1b..d1b115d213c 100644 --- a/.github/license-checker.yml +++ b/.github/license-checker.yml @@ -11,7 +11,6 @@ header: - 'LICENSE' - 'Makefile' - 'pom.xml' - - 'spotbugs-include.xml' - 'shell.nix' - '.ci/' - '.gitignore'