pool/plexus-sec-dispatcher
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 977027 from Java:packages

Browse Source 
Fix build with modello-2.0.0

OBS-URL: https://build.opensuse.org/request/show/977027
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-sec-dispatcher?expand=0&rev=4
This commit is contained in:
Dominique Leuenberger 2022-05-13 21:03:22 +00:00 committed by Git OBS Bridge
commit 9fe05b2dac
3 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
plexus-sec-dispatcher-build.xml
View File

@ -65,30 +65,32 @@
<target name="gen-src" description="Generate sources from mdo files"> <target name="gen-src" description="Generate sources from mdo files">
<mkdir dir="${build.mdoOutputDir}"/> <mkdir dir="${build.mdoOutputDir}"/>
<exec executable="modello" failonerror="true"> <macrodef name="modello-single-mode">
<arg value="${build.mdoDir}/settings-security.mdo"/> <attribute name="file"/>
<arg value="java"/> <attribute name="mode"/>
<arg value="${build.mdoOutputDir}"/> <attribute name="version"/>
<arg value="1.0.0"/> <sequential>
<arg value="false"/> <exec executable="modello" failonerror="true">
<arg value="true"/> <arg file="@{file}"/> <!-- model file -->
</exec> <arg value="@{mode}"/> <!-- output type -->
<exec executable="modello" failonerror="true"> <arg file="${build.mdoOutputDir}"/> <!-- output directory -->
<arg value="${build.mdoDir}/settings-security.mdo"/> <arg value="@{version}"/> <!-- model version -->
<arg value="xpp3-reader"/> <arg value="false"/> <!-- package with version -->
<arg value="${build.mdoOutputDir}"/> <arg value="8"/> <!-- javaSource -->
<arg value="1.0.0"/> </exec>
<arg value="false"/> </sequential>
<arg value="true"/> </macrodef>
</exec> <macrodef name="modello">
<exec executable="modello" failonerror="true"> <attribute name="file"/>
<arg value="${build.mdoDir}/settings-security.mdo"/> <attribute name="version" default="1.0.0"/>
<arg value="xpp3-writer"/> <sequential>
<arg value="${build.mdoOutputDir}"/> <echo taskname="modello" message="Generating sources for @{file}"/>
<arg value="1.0.0"/> <modello-single-mode file="@{file}" version="@{version}" mode="java"/>
<arg value="false"/> <modello-single-mode file="@{file}" version="@{version}" mode="xpp3-reader"/>
<arg value="true"/> <modello-single-mode file="@{file}" version="@{version}" mode="xpp3-writer"/>
</exec> </sequential>
</macrodef>
<modello file="${build.mdoDir}/settings-security.mdo"/>
</target> </target>
<!-- ====================================================================== --> <!-- ====================================================================== -->

5
plexus-sec-dispatcher.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri May 13 09:06:37 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Fix build with modello-2.0.0
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 13 17:21:04 UTC 2022 - Fridrich Strba <fstrba@suse.com> Thu Jan 13 17:21:04 UTC 2022 - Fridrich Strba <fstrba@suse.com>

2
plexus-sec-dispatcher.spec
View File

@ -32,7 +32,7 @@ BuildRequires: atinject
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.7 BuildRequires: java-devel >= 1.7
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: modello BuildRequires: modello >= 2.0.0
BuildRequires: plexus-cipher BuildRequires: plexus-cipher
BuildRequires: plexus-containers-container-default BuildRequires: plexus-containers-container-default
BuildRequires: plexus-metadata-generator BuildRequires: plexus-metadata-generator