Fridrich Strba 2023-09-13 18:26:00 +00:00 committed by Git OBS Bridge
parent 58a5aa3ce7
commit 1dbbef9bef
2 changed files with 21 additions and 17 deletions

View File

@ -19,7 +19,7 @@
<property name="spec.version" value="3.11"/> <property name="spec.version" value="3.11"/>
<property name="compiler.source" value="1.7"/> <property name="compiler.source" value="1.8"/>
<property name="compiler.target" value="${compiler.source}"/> <property name="compiler.target" value="${compiler.source}"/>
<property name="build.finalName" value="${project.artifactId}-${project.version}"/> <property name="build.finalName" value="${project.artifactId}-${project.version}"/>

View File

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