Accepting request 963094 from Java:packages

source/target levels 8

OBS-URL: https://build.opensuse.org/request/show/963094
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jdepend?expand=0&rev=20
This commit is contained in:
Dominique Leuenberger 2022-03-28 14:59:19 +00:00 committed by Git OBS Bridge
commit 35d6896973
3 changed files with 14 additions and 35 deletions

View File

@ -1,31 +0,0 @@
Index: build.xml
===================================================================
--- build.xml.orig
+++ build.xml
@@ -38,7 +38,7 @@
<target name="compile" depends="prepare"
description="Compiles the source code">
- <javac srcdir="${src.dir}"
+ <javac source="1.6" target="1.6" srcdir="${src.dir}"
destdir="${build.dir}"
debug="${build.debug}"
includeantruntime="false">
@@ -48,7 +48,7 @@
<target name="compile-sample" depends="prepare"
description="Compiles the sample code">
- <javac srcdir="sample"
+ <javac source="1.6" target="1.6" srcdir="sample"
destdir="${build.dir}"
debug="${build.debug}"
includeantruntime="false">
@@ -59,7 +59,7 @@
<target name="compile-tests" depends="compile"
if="junit.available"
description="Compiles the test code">
- <javac srcdir="${test.dir}"
+ <javac source="1.6" target="1.6" srcdir="${test.dir}"
destdir="${build.dir}"
debug="${build.debug}"
includeantruntime="false">

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sat Mar 19 21:48:11 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Specify the source/target levels 8 on ant invocation
- Removed patch:
* jdepend-target16.patch
+ not needed with the source/target levels being specified on
command-line
-------------------------------------------------------------------
Tue Dec 28 13:00:04 UTC 2021 - David Anes <david.anes@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package jdepend
#
# Copyright (c) 2021 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
@ -26,7 +26,6 @@ Group: Development/Libraries/Java
URL: http://www.clarkware.com/software/JDepend.html
Source0: https://github.com/clarkware/jdepend/archive/refs/tags/%{version}.tar.gz
Source1: %{name}-%{version}.pom
Patch0: jdepend-target16.patch
BuildRequires: ant
BuildRequires: java-devel
BuildRequires: javapackages-local
@ -58,10 +57,12 @@ This package contains demonstration and sample files for JDepend.
%setup -q
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
%patch0 -b .target15
%build
ant jar
%ant \
-Dant.build.javac.source=1.8 \
-Dant.build.javac.target=1.8 \
jar
%install
# jars