diff --git a/0001-Port-to-Modello-2.0.0.patch b/0001-Port-to-Modello-2.0.0.patch new file mode 100644 index 0000000..e3ac754 --- /dev/null +++ b/0001-Port-to-Modello-2.0.0.patch @@ -0,0 +1,24 @@ +diff -Nur a/xmvn-api/pom.xml b/xmvn-api/pom.xml +--- a/xmvn-api/pom.xml 2023-08-24 11:12:19.139288730 +0800 ++++ b/xmvn-api/pom.xml 2023-08-24 11:14:23.225087476 +0800 +@@ -38,7 +38,7 @@ + modello-maven-plugin + + 3.0.0 +- true ++ 11 + false + + src/main/mdo/config.mdo +diff -Nur a/xmvn-parent/pom.xml b/xmvn-parent/pom.xml +--- a/xmvn-parent/pom.xml 2023-08-24 11:12:19.175289252 +0800 ++++ b/xmvn-parent/pom.xml 2023-08-24 11:15:32.738095136 +0800 +@@ -108,7 +108,7 @@ + 4.12 + 2.3 + 1.0 +- 1.9.1 ++ 2.0.0 + 1.6.8 + 3.0.1 + 2.9 diff --git a/xmvn.spec b/xmvn.spec index b11878e..1f803cd 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -2,7 +2,7 @@ Name: xmvn Version: 3.0.0 -Release: 24 +Release: 25 Summary: Local Extensions for Apache Maven License: ASL 2.0 URL: https://fedora-java.github.io/xmvn/ @@ -17,6 +17,7 @@ Patch0004: 0001-Fix-configuration-of-aliased-plugins.patch Patch0005: 0001-Don-t-use-JAXB-for-converting-bytes-to-hex-string.patch Patch0006: 0001-Use-apache-commons-compress-for-manifest-injection-a.patch Patch0007: 0001-Port-to-Gradle-4.4.1.patch +Patch0008: 0001-Port-to-Modello-2.0.0.patch BuildRequires: maven >= 3.5.0 maven-local apache-commons-compress beust-jcommander cglib BuildRequires: maven-dependency-plugin maven-plugin-build-helper maven-assembly-plugin @@ -254,6 +255,9 @@ cp -P ${maven_home}/bin/m2.conf %{buildroot}%{_datadir}/xmvn/bin/ %doc NOTICE %changelog +* Tue Aug 22 2023 wulei - 3.0.0-25 +- Port to Modello 2.0.0 + * Mon Feb 28 2022 Ge Wang 3.0.0-24 - Modify tests file due to maven upgrade to version 3.6.3