diff --git a/SOURCES/0003-Port-to-maven-3.8.1.patch b/SOURCES/0003-Port-to-maven-3.8.1.patch new file mode 100644 index 0000000..2786be2 --- /dev/null +++ b/SOURCES/0003-Port-to-maven-3.8.1.patch @@ -0,0 +1,33 @@ +From 4dc38f384dab2d825e1ab6f7df018650b6aeded1 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Fri, 17 Dec 2021 13:42:11 +0100 +Subject: [PATCH] Port to maven 3.8.1 + +--- + .../plugin/testing/stubs/StubArtifactRepository.java | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.java +index 9a435b7..c13c3a8 100644 +--- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.java ++++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.java +@@ -247,4 +247,16 @@ public class StubArtifactRepository + { + // no op + } ++ ++ @Override ++ public boolean isBlocked() ++ { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public void setBlocked(boolean blocked) ++ { ++ throw new UnsupportedOperationException(); ++ } + } +-- +2.31.1 + diff --git a/SPECS/maven-plugin-testing.spec b/SPECS/maven-plugin-testing.spec index aee093b..3bb695d 100644 --- a/SPECS/maven-plugin-testing.spec +++ b/SPECS/maven-plugin-testing.spec @@ -1,16 +1,23 @@ +%bcond_with bootstrap + Name: maven-plugin-testing Version: 3.3.0 -Release: 14%{?dist} +Release: 51%{?dist} Summary: Maven Plugin Testing -License: ASL 2.0 -URL: http://maven.apache.org/plugin-testing/ +License: Apache-2.0 +URL: https://maven.apache.org/plugin-testing/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch -Source0: http://repo1.maven.org/maven2/org/apache/maven/plugin-testing/%{name}/%{version}/%{name}-%{version}-source-release.zip +Source0: https://repo1.maven.org/maven2/org/apache/maven/plugin-testing/%{name}/%{version}/%{name}-%{version}-source-release.zip -Patch0: 0001-Port-to-plexus-utils-3.0.21.patch -Patch1: 0002-Port-to-current-maven-artifact.patch +Patch: 0001-Port-to-plexus-utils-3.0.21.patch +Patch: 0002-Port-to-current-maven-artifact.patch +Patch: 0003-Port-to-maven-3.8.1.patch +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: maven-local BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(junit:junit) @@ -20,79 +27,136 @@ BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) -BuildRequires: mvn(org.apache.maven.shared:maven-invoker) -BuildRequires: mvn(org.apache.maven.wagon:wagon-file) BuildRequires: mvn(org.codehaus.plexus:plexus-archiver) -BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) -BuildRequires: mvn(org.easymock:easymock) +%endif %description The Maven Plugin Testing contains the necessary modules to be able to test Maven Plugins. %package javadoc -Summary: Javadoc for %{name} +Summary: API documentation for %{name} %description javadoc API documentation for %{name}. %package harness -Summary: Maven Plugin Testing Mechanism +Summary: Maven Plugin Testing Mechanism %description harness The Maven Plugin Testing Harness provides mechanisms to manage tests on Mojo. -%package tools -Summary: Maven Plugin Testing Tools - -%description tools -A set of useful tools to help the Maven Plugin testing. - -%package -n maven-test-tools -Summary: Maven Testing Tool - -%description -n maven-test-tools -Framework to test Maven Plugins with Easymock objects. - %prep -%setup -q +%autosetup -p1 -%patch0 -p1 -%patch1 -p1 %pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :maven-site-plugin +%pom_remove_plugin :maven-source-plugin maven-plugin-testing-harness -sed -i -e "s/MockControl/IMocksControl/g" maven-test-tools/src/main/java/org/apache/maven/shared/tools/easymock/MockManager.java - -# needs network for some reason -rm maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ProjectToolTest.java +%pom_disable_module maven-plugin-testing-tools +%pom_disable_module maven-test-tools %mvn_alias : org.apache.maven.shared: %build -%mvn_build -s +%mvn_build -s -- -Dmaven.compiler.target=8 %install %mvn_install %files -f .mfiles-%{name} -%doc LICENSE NOTICE -%files harness -f .mfiles-%{name}-harness -%files tools -f .mfiles-%{name}-tools -%files -n maven-test-tools -f .mfiles-maven-test-tools +%license LICENSE NOTICE + %files javadoc -f .mfiles-javadoc -%doc LICENSE NOTICE +%license LICENSE NOTICE + +%files harness -f .mfiles-%{name}-harness %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 3.3.0-49 +- Update javapackages test plan to f42 + +* Fri Aug 23 2024 Mikolaj Izdebski - 3.3.0-48 +- Fix Maven compiler target setting + +* Wed Jul 24 2024 Mikolaj Izdebski - 3.3.0-35 +- Install license files in licensedir instead of docdir + +* Thu Jul 18 2024 Fedora Release Engineering - 3.3.0-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 3.3.0-33 +- Rebuilt for java-21-openjdk as system jdk + +* Tue Feb 20 2024 Marian Koncek - 3.3.0-32 +- Update Java source/target to 1.8 + +* Thu Jan 25 2024 Fedora Release Engineering - 3.3.0-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 3.3.0-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 3.3.0-29 +- Convert License tag to SPDX format + +* Thu Jul 20 2023 Fedora Release Engineering - 3.3.0-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 3.3.0-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 3.3.0-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 3.3.0-25 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 3.3.0-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jan 05 2022 Marian Koncek - 3.3.0-23 +- Port to maven 3.8.1 + +* Tue Nov 02 2021 Mikolaj Izdebski - 3.3.0-22 +- Set explicit Java compiler source/target levels to 1.7 + +* Thu Jul 22 2021 Fedora Release Engineering - 3.3.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 3.3.0-20 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 3.3.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 3.3.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 3.3.0-17 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jan 29 2020 Fedora Release Engineering - 3.3.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Nov 05 2019 Mikolaj Izdebski - 3.3.0-14 - Mass rebuild for javapackages-tools 201902 +* Thu Jul 25 2019 Fedora Release Engineering - 3.3.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 24 2019 Mikolaj Izdebski - 3.3.0-13 - Mass rebuild for javapackages-tools 201901 +* Fri Feb 01 2019 Fedora Release Engineering - 3.3.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 3.3.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Igor Gnatenko - 3.3.0-12 - Escape macros in %%changelog @@ -230,7 +294,7 @@ rm maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ - Fix installed pom.xml source path * Thu May 27 2010 Yong Yang 1:1.2-2.6 -- Add more maven depmap for maven-test-tools and maven-plugin-testing-tools for backward compatibility +- Add more maven depmap for maven-test-tools and maven-plugin-testing-tools for backward compatibility * Thu May 27 2010 Yong Yang 1:1.2-2.5 - Fix maven-plugin-testing-tools pom name