diff --git a/.gitignore b/.gitignore index b224759..32b8671 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /plexus-io-3.1.1.tar.gz /plexus-io-3.2.0.tar.gz /plexus-io-3.4.1.tar.gz +/plexus-io-3.4.2.tar.gz diff --git a/plexus-io.spec b/plexus-io.spec index 41ab792..55b40e7 100644 --- a/plexus-io.spec +++ b/plexus-io.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: plexus-io -Version: 3.4.1 -Release: 4%{?dist} +Version: 3.4.2 +Release: 1%{?dist} Summary: Plexus IO Components License: Apache-2.0 URL: https://github.com/codehaus-plexus/plexus-io @@ -17,13 +17,17 @@ BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local BuildRequires: mvn(com.google.code.findbugs:jsr305) +BuildRequires: mvn(com.google.inject:guice) BuildRequires: mvn(commons-io:commons-io) -BuildRequires: mvn(junit:junit) -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) -BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) -BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) +BuildRequires: mvn(javax.inject:javax.inject) +BuildRequires: mvn(org.codehaus.plexus:plexus-testing) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.codehaus.plexus:plexus-xml) +BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) +BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject) BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) +BuildRequires: mvn(org.slf4j:slf4j-simple) %endif %description @@ -40,10 +44,8 @@ API documentation for %{name}. %setup -q -n plexus-io-plexus-io-%{version} cp %{SOURCE1} . -%pom_remove_plugin :animal-sniffer-maven-plugin - # Test fails in mock -sed -i /class/i@org.junit.Ignore src/test/java/org/codehaus/plexus/components/io/attributes/SymlinkUtilsTest.java +sed -i /class/i@org.junit.jupiter.api.Disabled src/test/java/org/codehaus/plexus/components/io/attributes/SymlinkUtilsTest.java %mvn_file : plexus/io @@ -60,6 +62,9 @@ sed -i /class/i@org.junit.Ignore src/test/java/org/codehaus/plexus/components/io %license NOTICE.txt LICENSE-2.0.txt %changelog +* Thu Feb 01 2024 Mikolaj Izdebski - 3.4.2-1 +- Update to upstream version 3.4.2 + * Thu Jan 25 2024 Fedora Release Engineering - 3.4.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 161eeda..eb9e85a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-io-3.4.1.tar.gz) = 42ded8e97a880834a4dd82433ef6b5a781fd5656ec17f7ffb1e718892b671a9680a389cb80a68d536a29081f051fc1269f74c2f45b51fccc83ff4f67916ffb62 +SHA512 (plexus-io-3.4.2.tar.gz) = bafbe36f7334ba816c515e558229454e00312d92a951b27ff6b1259bf6b04c9d2def80f72f7c2703af96f46a25ce664a7783dca75aff6eca265aa80a3347fd07 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8