Merge branch 'rawhide' into f35

This commit is contained in:
Didik Supriadi 2021-11-20 12:03:30 +07:00
commit 5f16603dc3

View file

@ -2,7 +2,7 @@
Name: xmlstreambuffer
Version: 1.5.10
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Stream Based Representation for XML Infoset
License: BSD
URL: https://github.com/eclipse-ee4j/metro-xmlstreambuffer
@ -33,26 +33,6 @@ pushd streambuffer
%pom_remove_plugin :maven-enforcer-plugin
%pom_remove_dep :woodstox-core
%pom_xpath_remove 'pom:plugin[pom:artifactId = "maven-compiler-plugin"]/pom:configuration/pom:source'
%pom_xpath_remove 'pom:plugin[pom:artifactId = "maven-compiler-plugin"]/pom:configuration/pom:target'
%pom_xpath_set 'pom:plugin[pom:artifactId = "maven-compiler-plugin"]/pom:executions/pom:execution[pom:id = "base-compile"]/pom:id' default-compile
%pom_xpath_inject 'pom:plugin[pom:artifactId = "maven-compiler-plugin"]/pom:executions' '
<execution>
<id>module-compile</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<source>9</source>
<target>9</target>
<includes>
<include>module-info.java</include>
</includes>
</configuration>
</execution>'
popd
%build
@ -70,6 +50,9 @@ popd
%doc CONTRIBUTING.md README.md
%changelog
* Wed Nov 17 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 1.5.10-3
- Remove workaround for SUREFIRE-1897
* Fri Oct 29 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 1.5.10-2
- Remove javadoc package