diff --git a/.gitignore b/.gitignore index f7937e1..49c0157 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/maven-jar-plugin-3.1.2-source-release.zip +SOURCES/maven-jar-plugin-3.3.0-source-release.zip diff --git a/.maven-jar-plugin.metadata b/.maven-jar-plugin.metadata index 384d149..1580c77 100644 --- a/.maven-jar-plugin.metadata +++ b/.maven-jar-plugin.metadata @@ -1 +1 @@ -957e46255183ecf73313424e9d75ee87eaa38657 SOURCES/maven-jar-plugin-3.1.2-source-release.zip +80922199b32c713d5b72308eb0a31928005eb35a SOURCES/maven-jar-plugin-3.3.0-source-release.zip diff --git a/SPECS/maven-jar-plugin.spec b/SPECS/maven-jar-plugin.spec index 4e0dcad..b88dbaf 100644 --- a/SPECS/maven-jar-plugin.spec +++ b/SPECS/maven-jar-plugin.spec @@ -1,63 +1,154 @@ +%bcond_with bootstrap + Name: maven-jar-plugin -Version: 3.1.2 -Release: 3%{?dist} +Version: 3.3.0 +Release: 14%{?dist} Summary: Maven JAR Plugin +License: Apache-2.0 +URL: https://maven.apache.org/plugins/maven-jar-plugin/ +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch -License: ASL 2.0 -URL: http://maven.apache.org/plugins/maven-jar-plugin/ -Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip - -BuildArch: noarch +Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: maven-local -BuildRequires: mvn(org.apache.maven:maven-archiver) >= 3.4.0 -BuildRequires: mvn(org.apache.maven:maven-artifact) -BuildRequires: mvn(org.apache.maven:maven-core) -BuildRequires: mvn(org.apache.maven:maven-plugin-api) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness) +BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) -BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.shared:file-management) -BuildRequires: mvn(org.codehaus.plexus:plexus-archiver) +BuildRequires: mvn(org.apache.maven:maven-archiver) +BuildRequires: mvn(org.apache.maven:maven-artifact) +BuildRequires: mvn(org.apache.maven:maven-compat) +BuildRequires: mvn(org.apache.maven:maven-core) +BuildRequires: mvn(org.apache.maven:maven-model) +BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +%endif %description Builds a Java Archive (JAR) file from the compiled project classes and resources. %package javadoc -Summary: Javadoc for %{name} +Summary: API documentation for %{name} %description javadoc API documentation for %{name}. - %prep -%setup -q +%autosetup -p1 +# System version of maven-jar-plugin should be used, not reactor version +%pom_xpath_inject pom:pluginManagement/pom:plugins "maven-jar-pluginSYSTEM" %build -# Test class MockArtifact doesn't override method getMetadata -%mvn_build -f -- -DmavenVersion=3.1.1 +%mvn_build %install %mvn_install %files -f .mfiles -%doc LICENSE NOTICE +%license LICENSE NOTICE %files javadoc -f .mfiles-javadoc -%doc LICENSE NOTICE +%license LICENSE NOTICE %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 3.3.0-13 +- Update javapackages test plan to f42 + +* Wed Jul 24 2024 Mikolaj Izdebski - 3.3.0-8 +- Install license files in licensedir instead of docdir + +* Thu Jul 18 2024 Fedora Release Engineering - 3.3.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 3.3.0-6 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 3.3.0-5 +- bump of release for for java-21-openjdk as system jdk + +* Thu Jan 25 2024 Fedora Release Engineering - 3.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 3.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 3.3.0-2 +- Convert License tag to SPDX format + +* Thu Aug 17 2023 Mikolaj Izdebski - 3.3.0-1 +- Update to upstream version 3.3.0 + +* Thu Jul 20 2023 Fedora Release Engineering - 3.2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 3.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 3.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Apr 26 2022 Mikolaj Izdebski - 3.2.2-1 +- Update to upstream version 3.2.2 + +* Sat Feb 05 2022 Jiri Vanek - 3.2.0-9 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 3.2.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 3.2.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 3.2.0-6 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 3.2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 3.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 3.2.0-3 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jan 29 2020 Fedora Release Engineering - 3.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Nov 20 2019 Marian Koncek - 3.2.0-1 +- Update to upstream version 3.2.0 + * Tue Nov 05 2019 Mikolaj Izdebski - 3.1.2-3 - Mass rebuild for javapackages-tools 201902 +* Sun Nov 03 2019 Fabio Valentini - 3.2.0-1 +- Update to version 3.2.0. + +* Thu Jul 25 2019 Fedora Release Engineering - 3.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Jun 08 2019 Fabio Valentini - 3.1.2-1 +- Update to version 3.1.2. + * Fri May 24 2019 Mikolaj Izdebski - 3.1.2-2 - Mass rebuild for javapackages-tools 201901 * Mon May 13 2019 Mikolaj Izdebski - 3.1.2-1 - Update to upstream version 3.1.2 +* Fri Feb 01 2019 Fedora Release Engineering - 3.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 3.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Apr 10 2018 Michael Simacek - 3.1.0-1 - Update to upstream version 3.1.0