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

Fix build failure due to snakeyaml update to 1.32

Browse Source 
(cherry picked from commit a31e32c41a1f001b3aa312a452d2ac1ac5cb2c54)
This commit is contained in:
starlet-dx 2023-03-09 19:33:01 +08:00 committed by openeuler-sync-bot
parent c6a9d92d9c
commit 8cade4bfaf
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
polyglot-snakeyaml-1.25.patch Normal file
View File

@ -0,0 +1,23 @@
diff -urEbwB polyglot-maven-polyglot-0.2.1/polyglot-yaml/src/main/java/org/sonatype/maven/polyglot/yaml/ModelRepresenter.java polyglot-maven-polyglot-0.2.1.new/polyglot-yaml/src/main/java/org/sonatype/maven/polyglot/yaml/ModelRepresenter.java
--- polyglot-maven-polyglot-0.2.1/polyglot-yaml/src/main/java/org/sonatype/maven/polyglot/yaml/ModelRepresenter.java 2017-09-06 19:21:53.000000000 +0200
+++ polyglot-maven-polyglot-0.2.1.new/polyglot-yaml/src/main/java/org/sonatype/maven/polyglot/yaml/ModelRepresenter.java 2019-11-10 20:22:59.071312361 +0100
@@ -205,8 +205,7 @@
* Change the default order. Important data goes first.
*/
@Override
- protected Set<Property> getProperties(Class<? extends Object> type)
- throws IntrospectionException {
+ protected Set<Property> getProperties(Class<? extends Object> type) {
if (type.isAssignableFrom(Model.class)) {
return sortTypeWithOrder(type, ORDER_MODEL);
} else if (type.isAssignableFrom(Developer.class)) {
@@ -222,8 +221,7 @@
}
}
- private Set<Property> sortTypeWithOrder(Class<? extends Object> type, List<String> order)
- throws IntrospectionException {
+ private Set<Property> sortTypeWithOrder(Class<? extends Object> type, List<String> order) {
Set<Property> standard = super.getProperties(type);
Set<Property> sorted = new TreeSet<Property>(new ModelPropertyComparator(order));
sorted.addAll(standard);

12
tesla-polyglot.spec
View File

@ -1,12 +1,13 @@
#Basic Information #Basic Information
Name: tesla-polyglot Name: tesla-polyglot
Version: 0.2.1 Version: 0.2.1
Release: 3 Release: 4
Summary: Modules to enable Maven usage in other JVM languages Summary: Modules to enable Maven usage in other JVM languages
License: EPL License: EPL-1.0
URL: https://github.com/takari/maven-polyglot URL: https://github.com/takari/maven-polyglot
Source0: https://github.com/takari/polyglot-maven/archive/polyglot-%{version}.tar.gz Source0: https://github.com/takari/polyglot-maven/archive/polyglot-%{version}.tar.gz
Source1: eclipse-1.0.txt Source1: eclipse-1.0.txt
Patch0: polyglot-snakeyaml-1.25.patch
BuildArch: noarch BuildArch: noarch
#Dependency #Dependency
@ -87,7 +88,7 @@ This package contains javadoc for %{name}.
#Build sections #Build sections
%prep %prep
%setup -q -n polyglot-maven-polyglot-%{version} %autosetup -n polyglot-maven-polyglot-%{version} -p1
find -name "*.class" -delete find -name "*.class" -delete
find -name "*.jar" -delete find -name "*.jar" -delete
@ -162,7 +163,7 @@ dos2unix eclipse-1.0.txt
%mvn_alias ':polyglot-{*}' org.sonatype.pmaven:pmaven-@1 %mvn_alias ':polyglot-{*}' org.sonatype.pmaven:pmaven-@1
%build %build
%mvn_build -s -- -Dproject.build.sourceEncoding=UTF-8 %mvn_build -s -f -- -Dproject.build.sourceEncoding=UTF-8
%install %install
%mvn_install %mvn_install
@ -191,6 +192,9 @@ dos2unix eclipse-1.0.txt
%license eclipse-1.0.txt license-header.txt %license eclipse-1.0.txt license-header.txt
%changelog %changelog
* Thu Mar 09 2023 yaoxin <yaoxin30@h-partners.com> - 0.2.1-4
- Fix build failure due to snakeyaml update to 1.32
* Fri Dec 06 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.2.1-3 * Fri Dec 06 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.2.1-3
- Package init - Package init