This commit is contained in:
parent
5e1e48de25
commit
efd85d25cb
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 25 20:55:17 UTC 2018 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Build with java source/target levels 8 since the code uses
|
||||
String.join() which does not exist before java 8
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 24 06:47:17 UTC 2018 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
@ -32,10 +32,10 @@ Source1: %{name}.pom
|
||||
Source2: generate-tarball.sh
|
||||
Patch0: 0001-ParseValues-NullPointerException-patch.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: java-devel >= 1.7
|
||||
BuildRequires: java-devel >= 1.8
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: javapackages-tools
|
||||
Requires: java >= 1.7
|
||||
Requires: java >= 1.8
|
||||
Obsoletes: %{short_name} < %{version}-%{release}
|
||||
Provides: %{short_name} = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
@ -62,8 +62,8 @@ sed -i 's/@VERSION@/%{version}/g' pom.xml
|
||||
%build
|
||||
mkdir -p build/classes
|
||||
mkdir -p build/javadoc
|
||||
javac -d build/classes -source 7 -target 7 `find src/main/java -name *.java | xargs`
|
||||
javadoc -d build/javadoc -source 7 --source-path src/main/java/ `find src/main/java -name *.java | xargs`
|
||||
javac -d build/classes -source 8 -target 8 `find src/main/java -name *.java | xargs`
|
||||
javadoc -d build/javadoc -source 8 --source-path src/main/java/ `find src/main/java -name *.java | xargs`
|
||||
(cd build/classes && jar cf ../%{name}-%{version}.jar `find . -name *.class | xargs`)
|
||||
|
||||
%install
|
||||
|
Loading…
Reference in New Issue
Block a user