Package: libspring-java
Version: 3.0.6.RELEASE-6
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * Transition package to use default java implementation:
    - d/control: BD on default-jdk (>= 1:1.6).

Note that the package already uses JAVA_HOME=/usr/lib/jvm/default-java
despite the fact that the current package does not directly depend on it.

  * d/patches/0011-java7-compat.patch: Compatibility patch for
    compilation with Java 7.

Basic patch to support compilation with openjdk-7 (default java in Ubuntu).

  * d/build-classpath: Explicitly add servlet-api-2.5.jar to classpath to
    ensure that build does not use incompatible servlet-api-3.0.

Ubuntu has transitioned some packages to use libservlet-api3.0-java to support
inclusion of tomcat7 in main - this causes a FTBFS due to the fact that
the servlet-api 3.0 is picked up automatically - this part of the fix ensures
that servlet-api 2.5 is used.  Note that spring 3.1 has support for 3.0.

Thanks for considering the patch.


- -- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.5.0-8-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCAAGBQJQIQqIAAoJEL/srsug59jDgZgQALKshrMpsvFZHBlCa3rEk1zq
TsquwJ2ZhaIYM8kb/UubPDfDOcyiihCcwiKZt22SitVJaLVkcVAuwYbZ6fMmOolP
m7wjWYe84aFg9cH9zFz2nxV57l273qWct363XOR3ppoqwRFu1lT/Q/oF9rq+FXob
S22GyvHjY6ubwccqf1lSW1YNc9zAheq72yIX+zxvuqtjLt0yeKYYypx4YG+MejmY
20hUhHYGy7eojId2o6vkxcRQo34p3wrK4c9hfwzjglyGwy1mBYMFlz6Noyj4wz6i
pCw8oX4ReSpIAlNloG/qOiK1YzcGEp+5yUoQcQGf2I6LPBbIGDSO3CvofvtzYq9M
jMR1ICMi5cP+1zfwH5iMx0FHr2oaC9MhNXcadO3XvaOV+ykb/rZoqw9y1U6UHb6/
M7qIh0MZw45aJijzgsUvJD0pWpSD6OPXRMzsvYZXHMOYK86IxJthnUWfN+ja+gVl
+fPCZGQStYXWnunY3CTVCZ46ZaRLNWDZCtsEOBzbgqNmpi2i0NDMLDKmBtHV3zfb
P5f4Mcalxn8o83mbe8bqm5LI4BCpggeOtRYiQownRin+SGm2YoX7QM7IkRwoW2dD
QDaU0i8qPpgXpRetOkylyAXtUYdjhEA7ZB3w5XWgMDYLjY1mNN90MpuKiLdrYhnQ
lGBJnur2yKMzDE7Iej3p
=k9zH
-----END PGP SIGNATURE-----
diff -Nru libspring-java-3.0.6.RELEASE/debian/build-classpath libspring-java-3.0.6.RELEASE/debian/build-classpath
--- libspring-java-3.0.6.RELEASE/debian/build-classpath	2012-01-14 16:27:40.000000000 +0000
+++ libspring-java-3.0.6.RELEASE/debian/build-classpath	2012-08-07 09:07:00.000000000 +0100
@@ -1,3 +1,5 @@
+# Ensure servlet 2.5 is used
+/usr/share/java/servlet-api-2.5.jar
 # Build system
 /usr/share/java/ivy.jar
 /usr/share/java/org.springframework.build.ant.jar
diff -Nru libspring-java-3.0.6.RELEASE/debian/changelog libspring-java-3.0.6.RELEASE/debian/changelog
diff -Nru libspring-java-3.0.6.RELEASE/debian/control libspring-java-3.0.6.RELEASE/debian/control
--- libspring-java-3.0.6.RELEASE/debian/control	2012-06-21 02:29:30.000000000 +0100
+++ libspring-java-3.0.6.RELEASE/debian/control	2012-08-07 13:27:07.000000000 +0100
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <draz...@debian.org>, Miguel Landaeta <mig...@miguel.cc>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), ant, openjdk-6-jdk | openjdk-7-jdk
+Build-Depends: debhelper (>= 7.0.50~), ant, default-jdk (>= 1:1.6)
 Build-Depends-Indep: maven-repo-helper (>= 1.1), ivy, spring-build-scripts,
  libaspectj-java, bsh, glassfish-javaee, glassfish-mail, glassfish-toplink-essentials,
  groovy, junit4 (>= 4.5), libaopalliance-java, libasm3-java, libatinject-jsr330-api-java,
diff -Nru libspring-java-3.0.6.RELEASE/debian/patches/0011-java7-compat.patch libspring-java-3.0.6.RELEASE/debian/patches/0011-java7-compat.patch
--- libspring-java-3.0.6.RELEASE/debian/patches/0011-java7-compat.patch	1970-01-01 01:00:00.000000000 +0100
+++ libspring-java-3.0.6.RELEASE/debian/patches/0011-java7-compat.patch	2012-08-07 13:26:45.000000000 +0100
@@ -0,0 +1,157 @@
+Description: Compatibility patch for JDBC 4.1 API in Java 7
+ Drop with 3.1 release of spring.
+Author: James Page <james.p...@ubuntu.com>
+Forwarded: not-needed
+
+Index: libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java
+===================================================================
+--- libspring-java-3.0.6.RELEASE.orig/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java	2012-08-06 18:06:09.943525138 +0100
++++ libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java	2012-08-06 18:06:10.875529907 +0100
+@@ -20,6 +20,8 @@
+ import java.sql.DriverManager;
+ import java.sql.SQLException;
+ import java.util.Properties;
++import java.sql.SQLFeatureNotSupportedException;
++import java.util.logging.Logger;
+ 
+ import org.springframework.util.Assert;
+ import org.springframework.util.ClassUtils;
+@@ -173,4 +175,11 @@
+ 		return DriverManager.getConnection(url, props);
+ 	}
+ 
++    /*
++     * JDBC 4.1
++     */
++    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
+ }
+Index: libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java
+===================================================================
+--- libspring-java-3.0.6.RELEASE.orig/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java	2012-08-06 18:06:09.943525138 +0100
++++ libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java	2012-08-06 18:06:10.879529928 +0100
+@@ -20,6 +20,8 @@
+ import java.sql.Driver;
+ import java.sql.SQLException;
+ import java.util.Properties;
++import java.sql.SQLFeatureNotSupportedException;
++import java.util.logging.Logger;
+ 
+ import org.springframework.beans.BeanUtils;
+ import org.springframework.util.Assert;
+@@ -140,4 +142,11 @@
+ 		return driver.connect(url, props);
+ 	}
+ 
++    /*
++     * JDBC 4.1
++     */
++    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
+ }
+Index: libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java
+===================================================================
+--- libspring-java-3.0.6.RELEASE.orig/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java	2012-08-06 18:06:09.943525138 +0100
++++ libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java	2012-08-06 18:06:10.879529928 +0100
+@@ -21,6 +21,8 @@
+ import java.sql.SQLException;
+ import java.util.Properties;
+ import javax.sql.DataSource;
++import java.sql.SQLFeatureNotSupportedException;
++import java.util.logging.Logger;
+ 
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+@@ -99,4 +101,11 @@
+ 		}
+ 	}
+ 
++
++    /*
++     * JDBC 4.1
++     */
++    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++        throw new SQLFeatureNotSupportedException();
++    }
+ }
+Index: libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
+===================================================================
+--- libspring-java-3.0.6.RELEASE.orig/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java	2012-08-06 18:06:09.943525138 +0100
++++ libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java	2012-08-06 18:07:24.095903511 +0100
+@@ -20,6 +20,8 @@
+ import java.sql.Connection;
+ import java.sql.SQLException;
+ import javax.sql.DataSource;
++import java.sql.SQLFeatureNotSupportedException;
++import java.util.logging.Logger;
+ 
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+@@ -228,6 +230,13 @@
+ 		public void shutdown() {
+ 			shutdownDatabase();
+ 		}
++
++        /*
++         * JDBC 4.1
++         */
++        public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++            throw new SQLFeatureNotSupportedException();
++        }
+ 	}
+ 
+ }
+Index: libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java
+===================================================================
+--- libspring-java-3.0.6.RELEASE.orig/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java	2012-08-06 18:06:09.943525138 +0100
++++ libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java	2012-08-06 18:06:10.879529928 +0100
+@@ -16,6 +16,9 @@
+ 
+ package org.springframework.jdbc.datasource.lookup;
+ 
++import java.sql.SQLFeatureNotSupportedException;
++import java.util.logging.Logger;
++
+ import org.springframework.core.Constants;
+ import org.springframework.transaction.TransactionDefinition;
+ import org.springframework.transaction.support.DefaultTransactionDefinition;
+@@ -123,4 +126,11 @@
+ 		return TransactionSynchronizationManager.getCurrentTransactionIsolationLevel();
+ 	}
+ 
++    /*
++     * JDBC 4.1
++     */
++    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
+ }
+Index: libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DelegatingDataSource.java
+===================================================================
+--- libspring-java-3.0.6.RELEASE.orig/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DelegatingDataSource.java	2012-08-06 18:06:09.943525138 +0100
++++ libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DelegatingDataSource.java	2012-08-06 18:06:10.879529928 +0100
+@@ -20,6 +20,8 @@
+ import java.sql.Connection;
+ import java.sql.SQLException;
+ import javax.sql.DataSource;
++import java.sql.SQLFeatureNotSupportedException;
++import java.util.logging.Logger;
+ 
+ import org.springframework.beans.factory.InitializingBean;
+ import org.springframework.util.Assert;
+@@ -117,4 +119,10 @@
+ 		return getTargetDataSource().isWrapperFor(iface);
+ 	}
+ 
++    /*
++     * JDBC 4.1
++     */
++    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++        throw new SQLFeatureNotSupportedException();
++    }
+ }
diff -Nru libspring-java-3.0.6.RELEASE/debian/patches/series libspring-java-3.0.6.RELEASE/debian/patches/series
--- libspring-java-3.0.6.RELEASE/debian/patches/series	2012-01-14 16:40:31.000000000 +0000
+++ libspring-java-3.0.6.RELEASE/debian/patches/series	2012-08-06 16:57:38.000000000 +0100
@@ -7,3 +7,4 @@
 0008_jpa_20_api.diff
 0009_hibernate_validator_41.diff
 0010_velocity_17.diff
+0011-java7-compat.patch
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Reply via email to