This commit is contained in:
parent
2138d31434
commit
3cd17ee992
@ -19,7 +19,7 @@
|
||||
|
||||
<property name="spec.version" value="3.2"/>
|
||||
|
||||
<property name="compiler.source" value="1.6"/>
|
||||
<property name="compiler.source" value="1.8"/>
|
||||
<property name="compiler.target" value="${compiler.source}"/>
|
||||
|
||||
<property name="build.finalName" value="${project.artifactId}-${project.version}"/>
|
||||
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 22 13:18:12 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Build with java source and target levels 8
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 25 17:28:29 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package maven-jar-plugin
|
||||
# spec file
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LLC
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -34,6 +34,7 @@ Source1: %{base_name}-build.xml
|
||||
Patch0: %{base_name}-bootstrap-resources.patch
|
||||
Patch1: 01-allow-replacing-artifacts.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: java-devel >= 1.8
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: maven-archiver >= 3.5.0
|
||||
BuildRequires: maven-file-management
|
||||
@ -95,23 +96,23 @@ cp %{SOURCE1} build.xml
|
||||
%if %{with bootstrap}
|
||||
mkdir -p lib
|
||||
build-jar-repository -s lib \
|
||||
maven-file-management/file-management \
|
||||
maven-archiver/maven-archiver \
|
||||
maven/maven-artifact \
|
||||
maven/maven-core \
|
||||
maven/maven-plugin-api \
|
||||
maven-plugin-tools/maven-plugin-annotations \
|
||||
org.eclipse.sisu.plexus \
|
||||
plexus/archiver \
|
||||
plexus/utils
|
||||
maven-file-management/file-management \
|
||||
maven-archiver/maven-archiver \
|
||||
maven/maven-artifact \
|
||||
maven/maven-core \
|
||||
maven/maven-plugin-api \
|
||||
maven-plugin-tools/maven-plugin-annotations \
|
||||
org.eclipse.sisu.plexus \
|
||||
plexus/archiver \
|
||||
plexus/utils
|
||||
%{ant} -Dtest.skip=true jar
|
||||
%else
|
||||
xmvn --batch-mode --offline \
|
||||
-Dmaven.test.skip=true -DmavenVersion=3.1.1 \
|
||||
-Dmaven.test.skip=true -DmavenVersion=3.1.1 \
|
||||
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
|
||||
-Dmaven.compiler.release=7 \
|
||||
-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
|
||||
|
Loading…
Reference in New Issue
Block a user