packages/morfologik-stemming
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build failure caused by beust-jcommander upgrade to 1.78

Browse Source
This commit is contained in:
starlet-dx 2023-09-22 11:42:12 +08:00
parent aefbd055d9
commit adf04f6c96
2 changed files with 5 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Fix-build-error.patch
View File

@ -1,51 +0,0 @@
diff -Nur a/morfologik-tools/src/main/java/morfologik/tools/CliTool.java b/morfologik-tools/src/main/java/morfologik/tools/CliTool.java
--- a/morfologik-tools/src/main/java/morfologik/tools/CliTool.java 2023-08-23 14:39:58.823450555 +0800
+++ b/morfologik-tools/src/main/java/morfologik/tools/CliTool.java 2023-08-23 14:43:50.962815645 +0800
@@ -178,13 +178,13 @@
private static void helpDisplayCommandOptions(PrintStream pw, String command, JCommander jc) {
StringBuilder sb = new StringBuilder();
jc = jc.getCommands().get(command);
- jc.getUsageFormatter().usage(sb, "");
+ jc.usage(sb, "");
pw.print(sb);
}
private static void helpDisplayCommandOptions(PrintStream pw, JCommander jc) {
StringBuilder sb = new StringBuilder();
- jc.getUsageFormatter().usage(sb, "");
+ jc.usage(sb, "");
pw.print(sb);
}
}
diff -Nur a/morfologik-tools/src/main/java/morfologik/tools/CustomParameterConverters.java b/morfologik-tools/src/main/java/morfologik/tools/CustomParameterConverters.java
--- a/morfologik-tools/src/main/java/morfologik/tools/CustomParameterConverters.java 2023-08-23 14:39:58.823450555 +0800
+++ b/morfologik-tools/src/main/java/morfologik/tools/CustomParameterConverters.java 2023-08-23 14:52:13.722103640 +0800
@@ -1,11 +1,11 @@
package morfologik.tools;
-import com.beust.jcommander.IStringConverter;
-import com.beust.jcommander.IStringConverterFactory;
-
import java.nio.file.Path;
import java.nio.file.Paths;
+import com.beust.jcommander.IStringConverter;
+import com.beust.jcommander.IStringConverterFactory;
+
class CustomParameterConverters implements IStringConverterFactory {
public static class PathConverter implements IStringConverter<Path> {
@Override
@@ -14,10 +14,11 @@
}
}
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
- public Class<? extends IStringConverter<?>> getConverter(Class<?> forType) {
+ public <T> Class<? extends IStringConverter<T>> getConverter(Class<T> forType) {
if (forType.equals(Path.class)) {
- return PathConverter.class;
+ return (Class) PathConverter.class;
}
return null;
}

9
morfologik-stemming.spec
View File

@ -1,11 +1,10 @@
Name: morfologik-stemming Name: morfologik-stemming
Version: 2.1.9 Version: 2.1.9
Release: 1 Release: 2
Summary: Morfologik stemming library Summary: Morfologik stemming library
License: BSD License: BSD
URL: https://github.com/morfologik/morfologik-stemming URL: https://github.com/morfologik/morfologik-stemming
Source0: https://github.com/morfologik/morfologik-stemming/archive/%{version}.tar.gz Source0: https://github.com/morfologik/morfologik-stemming/archive/%{version}.tar.gz
Patch0: Fix-build-error.patch
BuildRequires: maven-local mvn(com.beust:jcommander) mvn(com.carrotsearch:hppc) BuildRequires: maven-local mvn(com.beust:jcommander) mvn(com.carrotsearch:hppc)
BuildRequires: mvn(com.google.guava:guava) mvn(commons-cli:commons-cli) BuildRequires: mvn(com.google.guava:guava) mvn(commons-cli:commons-cli)
BuildRequires: mvn(commons-lang:commons-lang) BuildRequires: mvn(commons-lang:commons-lang)
@ -29,8 +28,7 @@ Summary: Javadoc for %{name}
This package contains javadoc for %{name}. This package contains javadoc for %{name}.
%prep %prep
%setup -q %autosetup -p1
%patch0 -p1
find . -name "*.class" -print -delete find . -name "*.class" -print -delete
find . -name "*.jar" -print -delete find . -name "*.jar" -print -delete
chmod 644 README.txt chmod 644 README.txt
@ -60,6 +58,9 @@ done
%license LICENSE.txt %license LICENSE.txt
%changelog %changelog
* Fri Sep 22 2023 yaoxin <yao_xin001@hoperun.com> - 2.1.9-2
- Fix build failure caused by beust-jcommander upgrade to 1.78
* Tue Aug 22 2023 wulei <wu_lei@hoperun.com> - 2.1.9-1 * Tue Aug 22 2023 wulei <wu_lei@hoperun.com> - 2.1.9-1
- Update to 2.1.9 - Update to 2.1.9