diff --git a/maven-compiler-plugin-build.xml b/maven-compiler-plugin-build.xml index e6d7460..172ac6e 100644 --- a/maven-compiler-plugin-build.xml +++ b/maven-compiler-plugin-build.xml @@ -19,7 +19,7 @@ - + diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec index 2c70eb4..29bc166 100644 --- a/maven-compiler-plugin.spec +++ b/maven-compiler-plugin.spec @@ -35,10 +35,12 @@ Patch0: %{base_name}-bootstrap-resources.patch BuildRequires: javapackages-local BuildRequires: maven-lib BuildRequires: maven-plugin-annotations +BuildRequires: maven-resolver-api +BuildRequires: maven-resolver-util BuildRequires: maven-shared-incremental BuildRequires: maven-shared-utils BuildRequires: objectweb-asm -BuildRequires: plexus-compiler +BuildRequires: plexus-compiler >= 2.13 BuildRequires: plexus-languages BuildRequires: unzip BuildRequires: xmvn-install @@ -108,26 +110,28 @@ cp %{SOURCE1} build.xml %if %{with bootstrap} mkdir -p lib build-jar-repository -s lib \ - maven/maven-artifact \ - maven/maven-core \ - maven/maven-model \ - maven/maven-plugin-api \ - maven-plugin-tools/maven-plugin-annotations \ - maven-shared-incremental/maven-shared-incremental \ - maven-shared-utils/maven-shared-utils \ - objectweb-asm/asm-all \ - plexus-compiler/plexus-compiler-api \ - plexus-compiler/plexus-compiler-javac \ - plexus-compiler/plexus-compiler-manager \ - plexus-languages/plexus-java + maven/maven-artifact \ + maven/maven-core \ + maven/maven-model \ + maven/maven-plugin-api \ + maven-plugin-tools/maven-plugin-annotations \ + maven-resolver/maven-resolver-api \ + maven-resolver/maven-resolver-util \ + maven-shared-incremental/maven-shared-incremental \ + maven-shared-utils/maven-shared-utils \ + objectweb-asm/asm-all \ + plexus-compiler/plexus-compiler-api \ + plexus-compiler/plexus-compiler-javac \ + plexus-compiler/plexus-compiler-manager \ + plexus-languages/plexus-java %{ant} -Dtest.skip=true jar %else xmvn --batch-mode --offline \ - -Dmaven.test.skip=true \ + -Dmaven.test.skip=true \ %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} - -Dmaven.compiler.release=8 \ + -Dmaven.compiler.release=8 \ %endif - package org.apache.maven.plugins:maven-javadoc-plugin:aggregate + package org.apache.maven.plugins:maven-javadoc-plugin:aggregate %endif %{mvn_artifact} pom.xml target/%{base_name}-%{version}.jar