Compare commits

...

No commits in common. "c10s" and "c8-stream-201902" have entirely different histories.

11 changed files with 39 additions and 155 deletions

View File

@ -1 +0,0 @@
1

8
.gitignore vendored
View File

@ -1,7 +1 @@
maven-plugin-testing-1.2.tar.xz
/maven-plugin-testing-2.0-alpha-1.tar.xz
/maven-plugin-testing-2.1-source-release.zip
/maven-plugin-testing-3.0.0-source-release.zip
/maven-plugin-testing-3.1.0-source-release.zip
/maven-plugin-testing-3.2.0-source-release.zip
/maven-plugin-testing-3.3.0-source-release.zip
SOURCES/maven-plugin-testing-3.3.0-source-release.zip

View File

@ -0,0 +1 @@
323812b9b5ce00a247375f12c27f4f6019258089 SOURCES/maven-plugin-testing-3.3.0-source-release.zip

View File

@ -1,33 +0,0 @@
From 4dc38f384dab2d825e1ab6f7df018650b6aeded1 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
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

View File

@ -1,23 +1,16 @@
%bcond_with bootstrap
Name: maven-plugin-testing
Version: 3.3.0
Release: 35%{?dist}
Release: 14%{?dist}
Summary: Maven Plugin Testing
License: Apache-2.0
URL: https://maven.apache.org/plugin-testing/
License: ASL 2.0
URL: http://maven.apache.org/plugin-testing/
BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
Source0: https://repo1.maven.org/maven2/org/apache/maven/plugin-testing/%{name}/%{version}/%{name}-%{version}-source-release.zip
Source0: http://repo1.maven.org/maven2/org/apache/maven/plugin-testing/%{name}/%{version}/%{name}-%{version}-source-release.zip
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
Patch0: 0001-Port-to-plexus-utils-3.0.21.patch
Patch1: 0002-Port-to-current-maven-artifact.patch
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: maven-local
BuildRequires: mvn(commons-io:commons-io)
BuildRequires: mvn(junit:junit)
@ -27,9 +20,13 @@ 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)
%endif
BuildRequires: mvn(org.easymock:easymock)
%description
The Maven Plugin Testing contains the necessary modules
@ -47,113 +44,55 @@ Summary: Maven Plugin Testing Mechanism
%description harness
The Maven Plugin Testing Harness provides mechanisms to manage tests on Mojo.
%prep
%autosetup -p1
%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
%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
%pom_disable_module maven-plugin-testing-tools
%pom_disable_module maven-test-tools
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
%mvn_alias : org.apache.maven.shared:
%build
%mvn_build -s -- -Dmaven.compiler.target=8
%mvn_build -s
%install
%mvn_install
%files -f .mfiles-%{name}
%license LICENSE NOTICE
%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
%files javadoc -f .mfiles-javadoc
%license LICENSE NOTICE
%doc LICENSE NOTICE
%changelog
* Thu Jan 16 2025 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-35
- Update Java compiler target settings
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.3.0-34
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Aug 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-33
- Switch Java compiler source/target to 1.8
- Resolves: RHEL-52698
* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 3.3.0-33
- Bump release for Aug 2024 java mass rebuild
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.3.0-32
- Bump release for June 2024 mass rebuild
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-29
- Convert License tag to SPDX format
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 3.3.0-25
- Rebuilt for java-17-openjdk as system jdk
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jan 05 2022 Marian Koncek <mkoncek@redhat.com> - 3.3.0-23
- Port to maven 3.8.1
* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-22
- Set explicit Java compiler source/target levels to 1.7
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-20
- Bootstrap build
- Non-bootstrap build
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.3.0-17
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-14
- Mass rebuild for javapackages-tools 201902
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-13
- Mass rebuild for javapackages-tools 201901
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.3.0-12
- Escape macros in %%changelog
@ -291,7 +230,7 @@ The Maven Plugin Testing Harness provides mechanisms to manage tests on Mojo.
- Fix installed pom.xml source path
* Thu May 27 2010 Yong Yang <yyang@redhat.com> 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 <yyang@redhat.com> 1:1.2-2.5
- Fix maven-plugin-testing-tools pom name

1
ci.fmf
View File

@ -1 +0,0 @@
resultsdb-testcase: separate

View File

@ -1,7 +0,0 @@
--- !Policy
product_versions:
- rhel-10
decision_contexts:
- osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}

View File

@ -1,7 +0,0 @@
summary: Run javapackages-specific tests
discover:
how: fmf
url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
ref: c10s
execute:
how: tmt

View File

@ -1 +0,0 @@
SHA512 (maven-plugin-testing-3.3.0-source-release.zip) = d4a36aeec71244d93ab880dfec88f48415098926898926094b53708e4ea0c49a7f82c4f058ec73e2c41d9650b370ca6526d73c067e8367ffec9324c1164e6d1e