From fba917d83a1b5dfb8c546f8a4dab1b6a5e29b1dea8ef56a0a4e1940efe5553b1 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 22 Mar 2022 15:14:08 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/velocity?expand=0&rev=42

---
 velocity.changes |  5 +++++
 velocity.spec    | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/velocity.changes b/velocity.changes
index acf2074..63e3e78 100644
--- a/velocity.changes
+++ b/velocity.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 22 15:13:03 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build with java source and target levels 8
+
 -------------------------------------------------------------------
 Tue Feb 22 18:59:05 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/velocity.spec b/velocity.spec
index f5a3126..a80400b 100644
--- a/velocity.spec
+++ b/velocity.spec
@@ -22,8 +22,8 @@ Release:        0
 Summary:        Java-based template engine
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            http://velocity.apache.org/
-Source0:        http://www.apache.org/dist/velocity/engine/%{version}/%{name}-%{version}.tar.gz
+URL:            https://velocity.apache.org/
+Source0:        https://archive.apache.org/dist/velocity/engine/%{version}/%{name}-%{version}.tar.gz
 Source1:        %{name}-%{version}.pom
 Patch0:         velocity-build_xml.patch
 Patch1:         velocity-1.7-CVE-2020-13936.patch
@@ -36,6 +36,7 @@ BuildRequires:  commons-lang
 BuildRequires:  commons-logging
 BuildRequires:  fdupes
 BuildRequires:  hsqldb
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
 BuildRequires:  jdom >= 1.0-1
 BuildRequires:  junit
@@ -47,7 +48,7 @@ BuildRequires:  werken-xpath
 Requires:       avalon-logkit
 Requires:       commons-collections
 Requires:       commons-lang
-Requires:       java >= 1.6.0
+Requires:       java >= 1.8
 Requires:       jdom >= 1.0-1
 Requires:       oro
 Requires:       reload4j
@@ -169,7 +170,6 @@ cp %{SOURCE1} pom.xml
 %pom_remove_parent pom.xml
 
 %build
-#export JAVA_HOME=%{_jvmdir}/java-1.5.0
 # Use servletapi4 instead of servletapi5 in CLASSPATH
 mkdir -p bin/test-lib
 pushd bin/test-lib
@@ -198,7 +198,7 @@ export OPT_JAR_LIST="ant/ant-junit junit"
 #FIXME: tests failed on CommonsExtPropTestCase
 #but resulting files seems to be same
 ant \
-  -Djavac.source=1.6 -Djavac.target=1.6 \
+  -Djavac.source=1.8 -Djavac.target=1.8 \
   -buildfile build/build.xml \
   jar javadocs