rpms/velocity
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Resolved rhbz#791045

Browse Source 
- Added patch from Omaid Majid <omajid@redhat.com> to fix build with Java 7
This commit is contained in:
Deepak Bhole 2012-02-17 13:44:04 -05:00
parent 9ddb8fbc41
commit f63d138ec4
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
0004-JDBC-41-compat.patch Normal file
View File

@ -0,0 +1,19 @@
--- a/src/test/org/apache/velocity/test/sql/HsqlDataSource.java 2012-02-15 19:49:20.202936454 -0500
+++ b/src/test/org/apache/velocity/test/sql/HsqlDataSource.java 2012-02-15 19:52:35.062574871 -0500
@@ -23,6 +23,7 @@
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
import javax.sql.DataSource;
@@ -73,5 +74,8 @@
public Object unwrap(final Class iface) throws SQLException {
throw new SQLException("Not implemented");
}
+ public java.util.logging.Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ throw new SQLFeatureNotSupportedException("getParentLogger() not supported");
+ }
}

8
velocity.spec
View File

@ -30,7 +30,7 @@
Name: velocity Name: velocity
Version: 1.7 Version: 1.7
Release: 2%{?dist} Release: 3%{?dist}
Epoch: 0 Epoch: 0
Summary: Java-based template engine Summary: Java-based template engine
License: ASL 2.0 License: ASL 2.0
@ -40,6 +40,7 @@ Source1: http://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{versi
Patch0: 0001-Remove-avalon-logkit.patch Patch0: 0001-Remove-avalon-logkit.patch
Patch1: 0002-Fix-servlet25-testcase.patch Patch1: 0002-Fix-servlet25-testcase.patch
Patch2: 0003-Use-system-jars.patch Patch2: 0003-Use-system-jars.patch
Patch3: 0004-JDBC-41-compat.patch
Group: Development/Libraries Group: Development/Libraries
Requires: apache-commons-collections Requires: apache-commons-collections
Requires: apache-commons-logging Requires: apache-commons-logging
@ -143,6 +144,7 @@ cp %{SOURCE1} ./pom.xml
# Use system jar files instead of downloading from net # Use system jar files instead of downloading from net
%patch2 -p1 %patch2 -p1
%patch3 -p1
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@ -223,6 +225,10 @@ install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%{_datadir}/%{name} %{_datadir}/%{name}
%changelog %changelog
* Fri Feb 17 2012 Deepak Bhole <dbhole@redhat.com> - 0:1.7-3
- Resolved rhbz#791045
- Added patch from Omaid Majid <omajid@redhat.com> to fix build with Java 7
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-2 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild