diff --git a/maven-shared-incremental-build.xml b/maven-shared-incremental-build.xml index 1f89bc5..df6c8da 100644 --- a/maven-shared-incremental-build.xml +++ b/maven-shared-incremental-build.xml @@ -14,7 +14,8 @@ - + + @@ -28,10 +29,6 @@ - - - - @@ -66,6 +63,7 @@ debug="true" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="false" @@ -80,100 +78,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - =================================== WARNING =================================== - JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed. - =============================================================================== - - @@ -207,7 +111,7 @@ - + + +- Use sisu-plexus instead of the old plexus-component-api + ------------------------------------------------------------------- Wed Sep 6 22:33:43 UTC 2023 - Fridrich Strba diff --git a/maven-shared-incremental.spec b/maven-shared-incremental.spec index a15fe6f..e60cd54 100644 --- a/maven-shared-incremental.spec +++ b/maven-shared-incremental.spec @@ -1,7 +1,7 @@ # # spec file for package maven-shared-incremental # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,8 +30,8 @@ BuildRequires: fdupes BuildRequires: javapackages-local >= 6 BuildRequires: maven-lib BuildRequires: maven-shared-utils -BuildRequires: plexus-component-api BuildRequires: plexus-containers-component-annotations +BuildRequires: sisu-plexus BuildRequires: unzip BuildArch: noarch @@ -50,6 +50,8 @@ This package provides %{summary}. %setup -q cp %{SOURCE1} build.xml +%pom_change_dep :plexus-component-api org.eclipse.sisu:org.eclipse.sisu.plexus:0.9.0.M2 + %build mkdir -p lib build-jar-repository -s lib \ @@ -57,11 +59,10 @@ build-jar-repository -s lib \ maven/maven-model \ maven/maven-plugin-api \ maven-shared-utils/maven-shared-utils \ - plexus-component-api/plexus-component-api \ + org.eclipse.sisu.plexus \ plexus-containers/plexus-component-annotations %{ant} \ - -Dtest.skip=true \ jar javadoc %install