diff --git a/ongres-stringprep.spec b/ongres-stringprep.spec index 339dc629e85eeb8d1921a2edb9ebd0eca71d6980..366a408ad6651318f7c2f836c024a71eb4bb17a4 100644 --- a/ongres-stringprep.spec +++ b/ongres-stringprep.spec @@ -2,7 +2,7 @@ Name: ongres-%upstream_name Version: 1.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: RFC 3454 Preparation of Internationalized Strings in pure Java License: BSD-2-Clause AND Apache-2.0 URL: https://github.com/ongres/%upstream_name @@ -13,7 +13,7 @@ BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.velocity:velocity) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) -BuildRequires: mvn(org.codehaus.mojo:exec-maven-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.slf4j:slf4j-simple) BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -43,6 +43,38 @@ find \( -name '*.jar' -o -name '*.class' \) -delete %pom_remove_plugin :maven-source-plugin %pom_remove_plugin -r :maven-javadoc-plugin +%pom_xpath_replace 'pom:plugins/pom:plugin[pom:artifactId="exec-maven-plugin"]' ' +<plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>any</version> + <dependencies> + <dependency> + <groupId>com.ongres.stringprep</groupId> + <artifactId>codegenerator</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <java classname="com.ongres.stringprep.codegenerator.GeneratorCode" failonerror="true"> + <arg value="${project.build.directory}/generated-sources/stringprep"/> + <classpath> + <path refid="maven.plugin.classpath"/> + </classpath> + </java> + </target> + </configuration> + </execution> + </executions> +</plugin>' stringprep/pom.xml + # codegenerator is only needed at build time, and has extra dependencies %mvn_package com.ongres.stringprep:codegenerator __noinstall @@ -59,6 +91,9 @@ find \( -name '*.jar' -o -name '*.class' \) -delete %license LICENSE %changelog +* Thu May 30 2024 Zuzana Miklankova <zmiklank@redhat.com> - 1.1-13 +- use maven antrun plugin instead of exec-maven-plugin + * Thu May 16 2024 Zuzana Miklankova <zmiklank@redhat.com> - 1.1-12 - bump release for rebuild with gating.yaml