diff --git a/.gitignore b/.gitignore index f3b0bd6..d324f4b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /sonatype-sisu-build-api-plexus-build-api-0.0.7-0-g883ea67.tar.gz /LICENSE-2.0.txt /plexus-build-api-0.0.7.tar.gz +/plexus-build-api-1.2.0.tar.gz diff --git a/plexus-build-api.spec b/plexus-build-api.spec index 256449b..dc9f741 100644 --- a/plexus-build-api.spec +++ b/plexus-build-api.spec @@ -1,28 +1,28 @@ %bcond_with bootstrap Name: plexus-build-api -Version: 0.0.7 -Release: 39%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: Plexus Build API License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-build-api BuildArch: noarch ExclusiveArch: %{java_arches} noarch -Source0: https://github.com/codehaus-plexus/plexus-build-api/archive/refs/tags/plexus-build-api-0.0.7.tar.gz +Source0: https://github.com/codehaus-plexus/plexus-build-api/archive/refs/tags/plexus-build-api-%{version}.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt -# Forwarded upstream: https://github.com/sonatype/sisu-build-api/pull/2 -Patch0: %{name}-migration-to-component-metadata.patch -Patch1: 0000-Port-to-plexus-utils-3.3.0.patch - %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local -BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) -BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) +BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) +BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) +BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin) +BuildRequires: mvn(org.slf4j:slf4j-api) +BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) %endif %description @@ -35,16 +35,9 @@ Summary: Javadoc for %{name} API documentation for %{name}. %prep -%setup -q -n plexus-build-api-plexus-build-api-0.0.7 +%setup -q -n plexus-build-api-plexus-build-api-%{version} cp -p %{SOURCE1} . -%patch0 -p1 -%patch1 -p1 - -%pom_remove_parent -# From upstream commit: https://github.com/codehaus-plexus/plexus-build-api/commit/6566292a7d85e275b824857bdf92d6504bc4824e -%pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/*" 1.8 - %mvn_file : plexus/%{name} # Install plexus-build-api-tests as well @@ -63,6 +56,9 @@ cp -p %{SOURCE1} . %doc LICENSE-2.0.txt %changelog +* Mon Aug 21 2023 Mikolaj Izdebski - 1.2.0-1 +- Update to upstream version 1.2.0 + * Fri Jul 21 2023 Fedora Release Engineering - 0.0.7-39 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 58b56b9..9930077 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-build-api-0.0.7.tar.gz) = dde7b2be1d993e2be6aaaefeafdb6108198a49c021298857ece2a6c82f1b112c4af6c204409e9efd7e11b07ed94235f5e9f9e643133d8a57507d7860ad70d94a +SHA512 (plexus-build-api-1.2.0.tar.gz) = 93536bb9276dfa08ea8a206eb4a448c81076424698910655fc76a14c2b37c3447ba44c386a93dde3708fcffdbd7a4e600b38fcae1ff9b5c42728dbcd43a35326 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8