packages/checkstyle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build failure caused by guava upgrade

Browse Source
This commit is contained in:
wk333 2023-11-13 09:17:16 +08:00
parent 936a8c9cbb
commit 1113b7a8d9
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
checkstyle-8.0-guava.patch Normal file
View File

@ -0,0 +1,12 @@
--- checkstyle-8.0/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.java 2021-05-11 07:12:44.130695340 +0200
+++ checkstyle-8.0/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.java 2021-05-11 07:12:56.534766508 +0200
@@ -216,7 +216,7 @@
private boolean containsForbiddenFragment(String firstSentence) {
String javadocText = JAVADOC_MULTILINE_TO_SINGLELINE_PATTERN
.matcher(firstSentence).replaceAll(" ");
- javadocText = CharMatcher.WHITESPACE.trimAndCollapseFrom(javadocText, ' ');
+ javadocText = CharMatcher.whitespace().trimAndCollapseFrom(javadocText, ' ');
return forbiddenSummaryFragments.matcher(javadocText).find();
}
}

7
checkstyle.spec
View File

@ -1,12 +1,13 @@
Name: checkstyle Name: checkstyle
Version: 8.0 Version: 8.0
Release: 1 Release: 2
Summary: Java source code checker Summary: Java source code checker
License: LGPLv2+ and GPLv2+ and BSD License: LGPLv2+ and GPLv2+ and BSD
URL: http://checkstyle.sourceforge.net/ URL: http://checkstyle.sourceforge.net/
Source0: http://download.sf.net/checkstyle/checkstyle-%{version}-src.tar.gz Source0: http://download.sf.net/checkstyle/checkstyle-%{version}-src.tar.gz
Source2: %{name}.catalog Source2: %{name}.catalog
Patch0: 0001-Do-not-load-external-DTDs-by-default.patch Patch0: 0001-Do-not-load-external-DTDs-by-default.patch
Patch1: checkstyle-8.0-guava.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: maven-local mvn(antlr:antlr) mvn(com.google.guava:guava) BuildRequires: maven-local mvn(antlr:antlr) mvn(com.google.guava:guava)
BuildRequires: mvn(commons-beanutils:commons-beanutils) mvn(commons-cli:commons-cli) BuildRequires: mvn(commons-beanutils:commons-beanutils) mvn(commons-cli:commons-cli)
@ -32,6 +33,7 @@ API documentation for %{name}.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch0 -p1 %patch0 -p1
%patch1 -p1
%pom_remove_parent %pom_remove_parent
sed -i s/guava-jdk5/guava/ pom.xml sed -i s/guava-jdk5/guava/ pom.xml
%pom_remove_plugin :maven-eclipse-plugin %pom_remove_plugin :maven-eclipse-plugin
@ -91,5 +93,8 @@ fi
%license LICENSE %license LICENSE
%changelog %changelog
* Mon Nov 13 2023 wangkai <13474090681@163.com> - 8.0-2
- Fix build failure caused by guava upgrade
* Thu Jul 30 2020 shaoqiang kang <kangshaoqiang1@huawei.com> - 8.0-1 * Thu Jul 30 2020 shaoqiang kang <kangshaoqiang1@huawei.com> - 8.0-1
- Package init - Package init