Accepting request 976567 from Java:packages
Fix build with new maven-install-plugin OBS-URL: https://build.opensuse.org/request/show/976567 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tycho?expand=0&rev=8
This commit is contained in:
commit
13587154e3
8
fakepom.xml
Normal file
8
fakepom.xml
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
<artifactId>rt.equinox.framework</artifactId>
|
||||||
|
<groupId>org.eclipse.equinox.framework</groupId>
|
||||||
|
<version>4.14.0-SNAPSHOT</version>
|
||||||
|
<packaging>pom</packaging>
|
||||||
|
</project>
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed May 11 11:40:55 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Fix bootstrapping with new version of maven-install-plugin
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Apr 11 19:51:41 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
Mon Apr 11 19:51:41 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -135,6 +135,7 @@ Name: tycho
|
|||||||
# or when the Eclipse that is present is not compatible
|
# or when the Eclipse that is present is not compatible
|
||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
Source10: eclipse-bootstrap-2019-12.tar.xz
|
Source10: eclipse-bootstrap-2019-12.tar.xz
|
||||||
|
Source11: fakepom.xml
|
||||||
%endif
|
%endif
|
||||||
%if %{with junit5}
|
%if %{with junit5}
|
||||||
BuildRequires: mvn(org.apache.maven.surefire:surefire-junit-platform)
|
BuildRequires: mvn(org.apache.maven.surefire:surefire-junit-platform)
|
||||||
@ -273,6 +274,7 @@ tar -xf %{SOURCE10}
|
|||||||
# Install OSGi bundles into local repo to override any incompatible system version
|
# Install OSGi bundles into local repo to override any incompatible system version
|
||||||
# that may be already installed
|
# that may be already installed
|
||||||
pushd bootstrap
|
pushd bootstrap
|
||||||
|
xmvn -o install:install-file -Dfile=%{SOURCE11} -DpomFile=%{SOURCE11} -Dmaven.repo.local=$(pwd)/../.m2
|
||||||
for f in usr/lib/eclipse/plugins/org.eclipse.osgi.compatibility.state_*.jar \
|
for f in usr/lib/eclipse/plugins/org.eclipse.osgi.compatibility.state_*.jar \
|
||||||
usr/lib/eclipse/plugins/org.eclipse.osgi.services_*.jar \
|
usr/lib/eclipse/plugins/org.eclipse.osgi.services_*.jar \
|
||||||
usr/lib/eclipse/plugins/org.eclipse.osgi.util_*.jar \
|
usr/lib/eclipse/plugins/org.eclipse.osgi.util_*.jar \
|
||||||
@ -382,6 +384,8 @@ for b in org.eclipse.osgi \
|
|||||||
org.eclipse.osgi.compatibility.state ; do
|
org.eclipse.osgi.compatibility.state ; do
|
||||||
osgiJarPath=$(find .m2/org/eclipse/tycho/$b/*/ -name "*.jar")
|
osgiJarPath=$(find .m2/org/eclipse/tycho/$b/*/ -name "*.jar")
|
||||||
osgiPomPath=$(find .m2/org/eclipse/tycho/$b/*/ -name "*.pom")
|
osgiPomPath=$(find .m2/org/eclipse/tycho/$b/*/ -name "*.pom")
|
||||||
|
%pom_remove_parent $osgiPomPath
|
||||||
|
%pom_xpath_set "pom:project/pom:groupId" "org.eclipse.tycho" $osgiPomPath
|
||||||
%{mvn_artifact} $osgiPomPath $osgiJarPath
|
%{mvn_artifact} $osgiPomPath $osgiJarPath
|
||||||
done
|
done
|
||||||
%endif
|
%endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user