Accepting request 969278 from Java:packages

trying to solve bsc#1198279

OBS-URL: https://build.opensuse.org/request/show/969278
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tycho?expand=0&rev=7
This commit is contained in:
Dominique Leuenberger 2022-04-11 21:49:53 +00:00 committed by Git OBS Bridge
commit d9cfc58def
2 changed files with 14 additions and 6 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Apr 11 19:51:41 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Try harder to assure that all classes in tycho are understood
by Java 8 (bsc#1198279)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 29 13:55:50 UTC 2022 - Fridrich Strba <fstrba@suse.com> Tue Mar 29 13:55:50 UTC 2022 - Fridrich Strba <fstrba@suse.com>

View File

@ -341,14 +341,16 @@ sed -i '
%{mvn_file} :{*} tycho/@1 %{mvn_file} :{*} tycho/@1
%build %build
%{mvn_build} -f \
%if %{with bootstrap} %if %{with bootstrap}
%global no_javadoc "-j" -j \
%else
%global no_javadoc %{nil}
%endif %endif
%{mvn_build} %{no_javadoc} -f -- \ -- -Dtycho-version=%{version}-SNAPSHOT -DtychoBootstrapVersion=%{version}-SNAPSHOT \
-Dtycho-version=%{version}-SNAPSHOT -DtychoBootstrapVersion=%{version}-SNAPSHOT \ -Dmaven.repo.local=$(pwd)/.m2 -Dfedora.p2.repos=$(pwd)/bootstrap \
-Dmaven.repo.local=$(pwd)/.m2 -Dfedora.p2.repos=$(pwd)/bootstrap -Dsource=8 %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-Dmaven.compiler.release=8 \
%endif
-Dsource=8
%{mvn_artifact} fedoraproject-p2/org.fedoraproject.p2/pom.xml %{mvn_artifact} fedoraproject-p2/org.fedoraproject.p2/pom.xml