[java-sig-commits] [velocity/f17] - Resolved rhbz#791045 - Added patch from Omaid Majid <omajid at redhat.com> to fix build with Java 7

[Deepak Bhole]

commit 52a7ad1a57b468723607c56d969b662da3494a88
Author: Deepak Bhole <dbhole at redhat.com>
Date:   Fri Feb 17 13:44:04 2012 -0500

    - Resolved rhbz#791045
    - Added patch from Omaid Majid <omajid at redhat.com> to fix build with Java 7

 0004-JDBC-41-compat.patch |   19 +++++++++++++++++++
 velocity.spec             |    8 +++++++-
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/0004-JDBC-41-compat.patch b/0004-JDBC-41-compat.patch
new file mode 100644
index 0000000..c137bac
--- /dev/null
+++ b/0004-JDBC-41-compat.patch
@@ -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");
++    }
+ 
+ }
diff --git a/velocity.spec b/velocity.spec
index 3ced86d..4d69185 100644
--- a/velocity.spec
+++ b/velocity.spec
@@ -30,7 +30,7 @@
 
 Name:           velocity
 Version:        1.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 Summary:        Java-based template engine
 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
 Patch1:         0002-Fix-servlet25-testcase.patch
 Patch2:         0003-Use-system-jars.patch
+Patch3:         0004-JDBC-41-compat.patch
 Group:          Development/Libraries
 Requires:       apache-commons-collections
 Requires:       apache-commons-logging
@@ -143,6 +144,7 @@ cp %{SOURCE1} ./pom.xml
 # Use system jar files instead of downloading from net
 %patch2 -p1
 
+%patch3 -p1
 
 # -----------------------------------------------------------------------------
 
@@ -223,6 +225,10 @@ install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 %{_datadir}/%{name}
 
 %changelog
+* Fri Feb 17 2012 Deepak Bhole <dbhole at redhat.com> - 0:1.7-3
+- Resolved rhbz#791045
+- Added patch from Omaid Majid <omajid at redhat.com> to fix build with Java 7
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild