The following commit has been merged in the master branch:
commit 7935cbe6b3a9bed59a9ef37713c543231a5a35de
Author: James Page <[email protected]>
Date: Thu Jun 21 20:44:00 2012 +0100
New upstream release:
* New upstream release:
- d/patches/java-1.6.patch: Dropped - upstream is now Java 6 compatible.
- d/control: Add new dependency on libmaven-enforcer-plugin-java.
* Fix FTBFS with openjdk-7 (LP: #888947):
- d/patches/java7-compat.patch: Add stub methods and allow compilation
with Java 6+.
diff --git a/debian/changelog b/debian/changelog
index 563aca1..50500c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+jenkins-winstone (0.9.10-jenkins-37+dfsg-1) unstable; urgency=low
+
+ * New upstream release:
+ - d/patches/java-1.6.patch: Dropped - upstream is now Java 6 compatible.
+ - d/control: Add new dependency on libmaven-enforcer-plugin-java.
+ * Fix FTBFS with openjdk-7 (LP: #888947):
+ - d/patches/java7-compat.patch: Add stub methods and allow compilation
+ with Java 6+.
+
+ -- James Page <[email protected]> Thu, 21 Jun 2012 20:25:39 +0100
+
jenkins-winstone (0.9.10-jenkins-35+dfsg-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index dfc48d5..5c77528 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,8 @@ Build-Depends-Indep:
junit (>= 3.8.1),
libhttpunit-java,
libmaven-antrun-plugin-java,
- libmaven-javadoc-plugin-java
+ libmaven-javadoc-plugin-java,
+ libmaven-enforcer-plugin-java
Standards-Version: 3.9.3
Homepage: http://github.com/jenkinsci/winstone
Vcs-Git: git://git.debian.org/git/pkg-java/jenkins-winstone.git
diff --git a/debian/patches/java-1.6.patch b/debian/patches/java-1.6.patch
deleted file mode 100644
index 98e65f9..0000000
--- a/debian/patches/java-1.6.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-Description: Patch to make source code Java 1.6 compatible as
- Java is not source backwards compatible.
-Author: James Page <[email protected]>
-Forwarded: not-needed
-
-Index:
jenkins-winstone/src/java/winstone/jndi/resourceFactories/WinstoneConnection.java
-===================================================================
----
jenkins-winstone.orig/src/java/winstone/jndi/resourceFactories/WinstoneConnection.java
2012-04-26 11:45:34.870800553 +0100
-+++
jenkins-winstone/src/java/winstone/jndi/resourceFactories/WinstoneConnection.java
2012-04-26 11:45:47.462328217 +0100
-@@ -6,15 +6,23 @@
- */
- package winstone.jndi.resourceFactories;
-
-+import java.sql.Array;
-+import java.sql.Blob;
- import java.sql.CallableStatement;
-+import java.sql.Clob;
- import java.sql.Connection;
- import java.sql.DatabaseMetaData;
-+import java.sql.NClob;
- import java.sql.PreparedStatement;
-+import java.sql.SQLClientInfoException;
- import java.sql.SQLException;
- import java.sql.SQLWarning;
-+import java.sql.SQLXML;
- import java.sql.Savepoint;
- import java.sql.Statement;
-+import java.sql.Struct;
- import java.util.Map;
-+import java.util.Properties;
-
- import winstone.Logger;
-
-@@ -149,10 +157,6 @@
- return this.realConnection.getTypeMap();
- }
-
-- public void setTypeMap(Map map) throws SQLException {
-- this.realConnection.setTypeMap(map);
-- }
--
- public String nativeSQL(String sql) throws SQLException {
- return this.realConnection.nativeSQL(sql);
- }
-@@ -222,4 +226,78 @@
- throws SQLException {
- return this.realConnection.prepareStatement(sql, columnNames);
- }
-+
-+ @Override
-+ public Struct createStruct(String typeName,Object[] attributes)
-+ throws SQLException {
-+ return this.realConnection.createStruct(typeName, attributes);
-+ }
-+
-+ @Override
-+ public Array createArrayOf(String typeName,Object[] elements)
-+ throws SQLException {
-+ return this.realConnection.createArrayOf(typeName, elements);
-+ }
-+
-+ @Override
-+ public Blob createBlob() throws SQLException {
-+ return this.realConnection.createBlob();
-+ }
-+
-+ @Override
-+ public Clob createClob() throws SQLException {
-+ return this.realConnection.createClob();
-+
-+ }
-+
-+ @Override
-+ public NClob createNClob() throws SQLException {
-+ return this.realConnection.createNClob();
-+ }
-+
-+ @Override
-+ public SQLXML createSQLXML() throws SQLException {
-+ return this.realConnection.createSQLXML();
-+ }
-+
-+ @Override
-+ public Properties getClientInfo() throws SQLException {
-+ return this.realConnection.getClientInfo();
-+ }
-+
-+ @Override
-+ public String getClientInfo(String arg0) throws SQLException {
-+ return this.realConnection.getClientInfo(arg0);
-+ }
-+
-+ @Override
-+ public boolean isValid(int arg0) throws SQLException {
-+ return this.realConnection.isValid(arg0);
-+ }
-+
-+ @Override
-+ public void setClientInfo(Properties arg0) throws
SQLClientInfoException {
-+ this.realConnection.setClientInfo(arg0);
-+ }
-+
-+ @Override
-+ public void setClientInfo(String arg0, String arg1)
-+ throws SQLClientInfoException {
-+ this.realConnection.setClientInfo(arg0,arg1);
-+ }
-+
-+ @Override
-+ public void setTypeMap(Map<String, Class<?>> arg0) throws SQLException {
-+ this.realConnection.setTypeMap(arg0);
-+ }
-+
-+ @Override
-+ public boolean isWrapperFor(Class<?> arg0) throws SQLException {
-+ return this.realConnection.isWrapperFor(arg0);
-+ }
-+
-+ @Override
-+ public <T> T unwrap(Class<T> arg0) throws SQLException {
-+ return this.realConnection.unwrap(arg0);
-+ }
- }
-Index:
jenkins-winstone/src/java/winstone/jndi/resourceFactories/WinstoneDataSource.java
-===================================================================
----
jenkins-winstone.orig/src/java/winstone/jndi/resourceFactories/WinstoneDataSource.java
2012-04-26 11:45:34.898799502 +0100
-+++
jenkins-winstone/src/java/winstone/jndi/resourceFactories/WinstoneDataSource.java
2012-04-26 11:45:47.462328217 +0100
-@@ -468,4 +468,14 @@
- "" + this.usedRealConnections.size(),
- "" + this.unusedRealConnections.size()});
- }
-+
-+ public <T> T unwrap(Class<T> iface)
-+ throws SQLException {
-+ throw new UnsupportedOperationException();
-+ }
-+
-+ public boolean isWrapperFor(Class<?> iface)
-+ throws SQLException {
-+ throw new UnsupportedOperationException();
-+ }
- }
-Index: jenkins-winstone/pom.xml
-===================================================================
---- jenkins-winstone.orig/pom.xml 2012-04-26 11:45:34.854801153 +0100
-+++ jenkins-winstone/pom.xml 2012-04-26 11:45:47.462328217 +0100
-@@ -57,6 +57,14 @@
- </testResources>
-
- <plugins>
-+ <plugin>
-+ <artifactId>maven-compiler-plugin</artifactId>
-+ <configuration>
-+ <source>1.5</source>
-+ <target>1.5</target>
-+ </configuration>
-+ </plugin>
-+
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
diff --git a/debian/patches/java7-compat.patch
b/debian/patches/java7-compat.patch
new file mode 100644
index 0000000..b2ccada
--- /dev/null
+++ b/debian/patches/java7-compat.patch
@@ -0,0 +1,78 @@
+Description: Add stubbed out methods to support compilation under
+ Java 7
+Author: James Page <[email protected]>
+Forwarded: https://github.com/jenkinsci/winstone/pull/4
+
+Index: jenkins-winstone/pom.xml
+===================================================================
+--- jenkins-winstone.orig/pom.xml 2012-06-21 20:25:25.000000000 +0100
++++ jenkins-winstone/pom.xml 2012-06-21 20:28:22.549686595 +0100
+@@ -126,7 +126,7 @@
+ <configuration>
+ <rules>
+ <requireJavaVersion>
+- <version>(1.6,1.7)</version>
++ <version>1.6,</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+Index:
jenkins-winstone/src/java/winstone/jndi/resourceFactories/WinstoneConnection.java
+===================================================================
+---
jenkins-winstone.orig/src/java/winstone/jndi/resourceFactories/WinstoneConnection.java
2012-06-21 20:25:25.000000000 +0100
++++
jenkins-winstone/src/java/winstone/jndi/resourceFactories/WinstoneConnection.java
2012-06-21 20:28:22.549686595 +0100
+@@ -24,6 +24,7 @@
+ import java.sql.Struct;
+ import java.util.Map;
+ import java.util.Properties;
++import java.util.concurrent.Executor;
+
+ import winstone.Logger;
+
+@@ -305,4 +306,25 @@
+ // TODO Auto-generated method stub
+
+ }
++
++ public void abort(Executor executor) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ public int getNetworkTimeout() throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ public String getSchema() throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ public void setNetworkTimeout(Executor executor, int milliseconds)
++ throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ public void setSchema(String schema) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
+ }
+Index:
jenkins-winstone/src/java/winstone/jndi/resourceFactories/WinstoneDataSource.java
+===================================================================
+---
jenkins-winstone.orig/src/java/winstone/jndi/resourceFactories/WinstoneDataSource.java
2012-06-21 20:25:25.000000000 +0100
++++
jenkins-winstone/src/java/winstone/jndi/resourceFactories/WinstoneDataSource.java
2012-06-21 20:28:22.549686595 +0100
+@@ -11,6 +11,7 @@
+ import java.sql.Driver;
+ import java.sql.PreparedStatement;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.util.ArrayList;
+ import java.util.Iterator;
+ import java.util.List;
+@@ -480,4 +481,9 @@
+ // TODO Auto-generated method stub
+ return false;
+ }
++
++ public java.util.logging.Logger getParentLogger()
++ throws SQLFeatureNotSupportedException {
++ throw new SQLFeatureNotSupportedException();
++ }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 8feca78..5024a24 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-java-1.6.patch
specification-resources.patch
+java7-compat.patch
--
jenkins-winstone packaging
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
