pool/velocity
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 963983 from Java:packages

Browse Source 
Build with source and target levels 8

OBS-URL: https://build.opensuse.org/request/show/963983
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/velocity?expand=0&rev=26
This commit is contained in:
Dominique Leuenberger 2022-03-22 18:41:00 +00:00 committed by Git OBS Bridge
commit e633b85458
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
velocity.changes
View File

@ -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> Tue Feb 22 18:59:05 UTC 2022 - Fridrich Strba <fstrba@suse.com>

10
velocity.spec
View File

@ -22,8 +22,8 @@ Release: 0
Summary: Java-based template engine Summary: Java-based template engine
License: Apache-2.0 License: Apache-2.0
Group: Development/Libraries/Java Group: Development/Libraries/Java
URL: http://velocity.apache.org/ URL: https://velocity.apache.org/
Source0: http://www.apache.org/dist/velocity/engine/%{version}/%{name}-%{version}.tar.gz Source0: https://archive.apache.org/dist/velocity/engine/%{version}/%{name}-%{version}.tar.gz
Source1: %{name}-%{version}.pom Source1: %{name}-%{version}.pom
Patch0: velocity-build_xml.patch Patch0: velocity-build_xml.patch
Patch1: velocity-1.7-CVE-2020-13936.patch Patch1: velocity-1.7-CVE-2020-13936.patch
@ -36,6 +36,7 @@ BuildRequires: commons-lang
BuildRequires: commons-logging BuildRequires: commons-logging
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: hsqldb BuildRequires: hsqldb
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: jdom >= 1.0-1 BuildRequires: jdom >= 1.0-1
BuildRequires: junit BuildRequires: junit
@ -47,7 +48,7 @@ BuildRequires: werken-xpath
Requires: avalon-logkit Requires: avalon-logkit
Requires: commons-collections Requires: commons-collections
Requires: commons-lang Requires: commons-lang
Requires: java >= 1.6.0 Requires: java >= 1.8
Requires: jdom >= 1.0-1 Requires: jdom >= 1.0-1
Requires: oro Requires: oro
Requires: reload4j Requires: reload4j
@ -169,7 +170,6 @@ cp %{SOURCE1} pom.xml
%pom_remove_parent pom.xml %pom_remove_parent pom.xml
%build %build
#export JAVA_HOME=%{_jvmdir}/java-1.5.0
# Use servletapi4 instead of servletapi5 in CLASSPATH # Use servletapi4 instead of servletapi5 in CLASSPATH
mkdir -p bin/test-lib mkdir -p bin/test-lib
pushd bin/test-lib pushd bin/test-lib
@ -198,7 +198,7 @@ export OPT_JAR_LIST="ant/ant-junit junit"
#FIXME: tests failed on CommonsExtPropTestCase #FIXME: tests failed on CommonsExtPropTestCase
#but resulting files seems to be same #but resulting files seems to be same
ant \ ant \
-Djavac.source=1.6 -Djavac.target=1.6 \ -Djavac.source=1.8 -Djavac.target=1.8 \
-buildfile build/build.xml \ -buildfile build/build.xml \
jar javadocs jar javadocs