[pkg-java] r17853 - in trunk/libcommons-dbcp-java/debian: . patches

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Mar 10 23:03:49 UTC 2014


Author: ebourg-guest
Date: 2014-03-10 23:03:49 +0000 (Mon, 10 Mar 2014)
New Revision: 17853

Added:
   trunk/libcommons-dbcp-java/debian/patches/03_exclude-transactions-tests.patch
Modified:
   trunk/libcommons-dbcp-java/debian/changelog
   trunk/libcommons-dbcp-java/debian/control
   trunk/libcommons-dbcp-java/debian/maven.ignoreRules
   trunk/libcommons-dbcp-java/debian/maven.properties
   trunk/libcommons-dbcp-java/debian/maven.rules
   trunk/libcommons-dbcp-java/debian/patches/02_java7_compat.patch
   trunk/libcommons-dbcp-java/debian/patches/series
Log:
Enabled the unit tests



Modified: trunk/libcommons-dbcp-java/debian/changelog
===================================================================
--- trunk/libcommons-dbcp-java/debian/changelog	2014-03-10 13:58:22 UTC (rev 17852)
+++ trunk/libcommons-dbcp-java/debian/changelog	2014-03-10 23:03:49 UTC (rev 17853)
@@ -1,5 +1,6 @@
 libcommons-dbcp-java (1.4-4) UNRELEASED; urgency=medium
 
+  * Enabled the unit tests
   * debian/control:
     - Removed the unused build dependency on libclirr-maven-plugin-java
     - Suggest the optional Maven dependencies instead of recommending them

Modified: trunk/libcommons-dbcp-java/debian/control
===================================================================
--- trunk/libcommons-dbcp-java/debian/control	2014-03-10 13:58:22 UTC (rev 17852)
+++ trunk/libcommons-dbcp-java/debian/control	2014-03-10 23:03:49 UTC (rev 17853)
@@ -2,10 +2,16 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Damien Raude-Morvan <drazzib at debian.org>, Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: debhelper (>= 9), cdbs, default-jdk, maven-debian-helper (>= 1.4)
-Build-Depends-Indep: libmaven-javadoc-plugin-java, libcommons-pool-java,
- default-jdk-doc, libcommons-pool-java-doc, libgeronimo-jta-1.1-spec-java
+Uploaders: Damien Raude-Morvan <drazzib at debian.org>,
+           Emmanuel Bourg <ebourg at apache.org>
+Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends-Indep: default-jdk-doc,
+                     junit,
+                     libcommons-pool-java,
+                     libcommons-pool-java-doc,
+                     libgeronimo-jta-1.1-spec-java,
+                     libmaven-javadoc-plugin-java,
+                     libtomcat7-java
 Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libcommons-dbcp-java/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libcommons-dbcp-java/
@@ -13,8 +19,8 @@
 
 Package: libcommons-dbcp-java
 Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}
-Suggests: ${maven:OptionalDepends}, libcommons-dbcp-java-doc
+Depends: ${maven:Depends}, ${misc:Depends}
+Suggests: libcommons-dbcp-java-doc, ${maven:OptionalDepends}
 Description: Database Connection Pooling Services
  The DBCP package provides database connection pooling services. The
  following features are supported
@@ -32,7 +38,7 @@
 Package: libcommons-dbcp-java-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, ${maven:DocDepends}
+Depends: ${maven:DocDepends}, ${misc:Depends}
 Recommends: ${maven:DocOptionalDepends}
 Suggests: libcommons-dbcp-java
 Description: Database Connection Pooling Services - documentation

Modified: trunk/libcommons-dbcp-java/debian/maven.ignoreRules
===================================================================
--- trunk/libcommons-dbcp-java/debian/maven.ignoreRules	2014-03-10 13:58:22 UTC (rev 17852)
+++ trunk/libcommons-dbcp-java/debian/maven.ignoreRules	2014-03-10 23:03:49 UTC (rev 17853)
@@ -15,7 +15,6 @@
 #   junit junit jar s/3\\..*/3.x/
 
 commons-logging commons-logging * * * *
-junit junit * * * *
 org.apache.geronimo.modules geronimo-transaction * * * *
 org.apache.maven.plugins maven-assembly-plugin * * * *
 org.apache.maven.plugins maven-changes-plugin * * * *
@@ -25,5 +24,4 @@
 org.codehaus.mojo clirr-maven-plugin * * * *
 org.codehaus.mojo cobertura-maven-plugin * * * *
 org.codehaus.mojo findbugs-maven-plugin * * * *
-tomcat naming-common * * * *
 tomcat naming-java * * * *

Modified: trunk/libcommons-dbcp-java/debian/maven.properties
===================================================================
--- trunk/libcommons-dbcp-java/debian/maven.properties	2014-03-10 13:58:22 UTC (rev 17852)
+++ trunk/libcommons-dbcp-java/debian/maven.properties	2014-03-10 23:03:49 UTC (rev 17853)
@@ -2,4 +2,3 @@
 # For example:
 # maven.test.skip=true
 
-maven.test.skip=true

Modified: trunk/libcommons-dbcp-java/debian/maven.rules
===================================================================
--- trunk/libcommons-dbcp-java/debian/maven.rules	2014-03-10 13:58:22 UTC (rev 17852)
+++ trunk/libcommons-dbcp-java/debian/maven.rules	2014-03-10 23:03:49 UTC (rev 17853)
@@ -17,3 +17,5 @@
 #   junit junit jar s/3\\..*/3.x/
 
 commons-dbcp commons-dbcp jar s/.*/debian/ * *
+junit junit jar s/.*/3.x/ * *
+s/tomcat/org.apache.tomcat/ s/naming-common/tomcat-catalina/ * s/.*/debian/ * *

Modified: trunk/libcommons-dbcp-java/debian/patches/02_java7_compat.patch
===================================================================
--- trunk/libcommons-dbcp-java/debian/patches/02_java7_compat.patch	2014-03-10 13:58:22 UTC (rev 17852)
+++ trunk/libcommons-dbcp-java/debian/patches/02_java7_compat.patch	2014-03-10 23:03:49 UTC (rev 17853)
@@ -2,10 +2,8 @@
 Origin: https://bugzilla.redhat.com/show_bug.cgi?id=796638
 Author: Pavel Tisnovsky <ptisnovs at redhat.com>
 
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/BasicDataSource.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/BasicDataSource.java	2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/BasicDataSource.java	2012-06-06 15:30:38.106421672 +0100
+--- a/src/java/org/apache/commons/dbcp/BasicDataSource.java
++++ b/src/java/org/apache/commons/dbcp/BasicDataSource.java
 @@ -24,10 +24,12 @@
  import java.util.ArrayList;
  import java.util.Iterator;
@@ -30,10 +28,8 @@
 +    }
 +
  }
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java	2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java	2012-06-06 15:30:38.106421672 +0100
+--- a/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java
++++ b/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java
 @@ -19,10 +19,12 @@
  
  import java.util.Hashtable;
@@ -58,10 +54,8 @@
 +    }
 +
  }
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java	2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java	2012-06-06 15:30:38.106421672 +0100
+--- a/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java
++++ b/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java
 @@ -21,10 +21,12 @@
  import java.io.ObjectInputStream;
  import java.sql.Connection;
@@ -86,10 +80,8 @@
 +    }
 +
  }
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java	2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java	2012-06-06 15:30:38.106421672 +0100
+--- a/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java
++++ b/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java
 @@ -21,6 +21,8 @@
  import java.io.ObjectInputStream;
  import java.sql.Connection;
@@ -111,10 +103,8 @@
 +
  }
  
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java	2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java	2012-06-06 15:30:38.106421672 +0100
+--- a/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java
++++ b/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java
 @@ -37,6 +37,7 @@
  import java.sql.RowId;
  import java.sql.SQLXML;
@@ -138,10 +128,8 @@
 +        throw new SQLFeatureNotSupportedException();
 +    }
  }
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingConnection.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/DelegatingConnection.java	2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingConnection.java	2012-06-06 15:30:38.110421690 +0100
+--- a/src/java/org/apache/commons/dbcp/DelegatingConnection.java
++++ b/src/java/org/apache/commons/dbcp/DelegatingConnection.java
 @@ -27,6 +27,7 @@
  import java.util.Iterator;
  import java.util.List;
@@ -191,10 +179,8 @@
 +    }
  }
 +
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java	2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java	2012-06-06 15:30:38.110421690 +0100
+--- a/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java
++++ b/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java
 @@ -24,6 +24,7 @@
  import java.sql.RowIdLifetime;
  /* JDBC_4_ANT_KEY_END */
@@ -217,10 +203,8 @@
 +        throw new SQLFeatureNotSupportedException();
 +    }
  }
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java	2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java	2012-06-06 15:30:38.110421690 +0100
+--- a/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java
++++ b/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java
 @@ -34,6 +34,7 @@
  import java.sql.RowId;
  import java.sql.SQLXML;
@@ -245,10 +229,8 @@
 +    }
 +
  }
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingResultSet.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/DelegatingResultSet.java	2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingResultSet.java	2012-06-06 15:30:38.110421690 +0100
+--- a/src/java/org/apache/commons/dbcp/DelegatingResultSet.java
++++ b/src/java/org/apache/commons/dbcp/DelegatingResultSet.java
 @@ -40,6 +40,7 @@
  import java.sql.RowId;
  import java.sql.SQLXML;
@@ -272,10 +254,8 @@
 +        throw new SQLFeatureNotSupportedException();
 +    }
  }
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingStatement.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/DelegatingStatement.java	2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingStatement.java	2012-06-06 15:30:38.110421690 +0100
+--- a/src/java/org/apache/commons/dbcp/DelegatingStatement.java
++++ b/src/java/org/apache/commons/dbcp/DelegatingStatement.java
 @@ -22,6 +22,7 @@
  import java.sql.SQLException;
  import java.sql.SQLWarning;
@@ -300,10 +280,8 @@
 +    }
 +
  }
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java	2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java	2012-06-06 15:30:38.110421690 +0100
+--- a/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java
++++ b/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java
 @@ -21,6 +21,7 @@
  import java.sql.Connection;
  import java.sql.ResultSet;
@@ -326,10 +304,8 @@
 +        throw new SQLFeatureNotSupportedException();
 +    }
  }
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java	2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java	2012-06-06 15:30:38.110421690 +0100
+--- a/src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java
++++ b/src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java
 @@ -21,6 +21,7 @@
  import java.sql.PreparedStatement;
  import java.sql.ResultSet;
@@ -353,10 +329,8 @@
 +    }
 +
  }
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolingConnection.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/PoolingConnection.java	2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolingConnection.java	2012-06-06 15:30:38.110421690 +0100
+--- a/src/java/org/apache/commons/dbcp/PoolingConnection.java
++++ b/src/java/org/apache/commons/dbcp/PoolingConnection.java
 @@ -21,8 +21,10 @@
  import java.sql.Connection;
  import java.sql.PreparedStatement;
@@ -399,10 +373,8 @@
 +    }
  }
 +
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolingDataSource.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/PoolingDataSource.java	2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolingDataSource.java	2012-06-06 15:30:38.110421690 +0100
+--- a/src/java/org/apache/commons/dbcp/PoolingDataSource.java
++++ b/src/java/org/apache/commons/dbcp/PoolingDataSource.java
 @@ -23,10 +23,12 @@
  import java.sql.DatabaseMetaData;
  import java.sql.PreparedStatement;
@@ -426,10 +398,8 @@
 +        throw new SQLFeatureNotSupportedException();
 +    }
  }
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolingDriver.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/PoolingDriver.java	2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolingDriver.java	2012-06-06 15:30:38.110421690 +0100
+--- a/src/java/org/apache/commons/dbcp/PoolingDriver.java
++++ b/src/java/org/apache/commons/dbcp/PoolingDriver.java
 @@ -27,6 +27,7 @@
  import java.sql.DriverPropertyInfo;
  import java.sql.PreparedStatement;
@@ -457,3 +427,147 @@
 +    }
 +
  }
+--- a/src/test/org/apache/commons/dbcp/TesterStatement.java
++++ b/src/test/org/apache/commons/dbcp/TesterStatement.java
+@@ -296,4 +296,15 @@
+         throw new SQLException("Not implemented.");
+     }
+ /* JDBC_4_ANT_KEY_END */
++
++    /* JDBC_4_1_ANT_KEY_BEGIN */
++    @Override
++    public void closeOnCompletion() throws SQLException {
++    }
++
++    @Override
++    public boolean isCloseOnCompletion() throws SQLException {
++        return false;
++    }
++    /* JDBC_4_1_ANT_KEY_END */
+ }
+--- a/src/test/org/apache/commons/dbcp/TesterCallableStatement.java
++++ b/src/test/org/apache/commons/dbcp/TesterCallableStatement.java
+@@ -456,4 +456,18 @@
+     public void setNClob(String parameterName, Reader reader) throws SQLException {
+     }
+ /* JDBC_4_ANT_KEY_END */
++
++    /* JDBC_4_1_ANT_KEY_BEGIN */
++    @Override
++    public <T> T getObject(int parameterIndex, Class<T> type)
++            throws SQLException {
++        return null;
++    }
++
++    @Override
++    public <T> T getObject(String parameterName, Class<T> type)
++            throws SQLException {
++        return null;
++    }
++    /* JDBC_4_1_ANT_KEY_END */
+ }
+--- a/src/test/org/apache/commons/dbcp/TesterDatabaseMetaData.java
++++ b/src/test/org/apache/commons/dbcp/TesterDatabaseMetaData.java
+@@ -761,4 +761,18 @@
+     }
+ 
+     /* JDBC_4_ANT_KEY_END */
++
++    /* JDBC_4_1_ANT_KEY_BEGIN */
++    @Override
++    public ResultSet getPseudoColumns(String catalog, String schemaPattern,
++            String tableNamePattern, String columnNamePattern)
++            throws SQLException {
++        return null;
++    }
++
++    @Override
++    public boolean generatedKeyAlwaysReturned() throws SQLException {
++        return false;
++    }
++    /* JDBC_4_1_ANT_KEY_END */
+ }
+--- a/src/test/org/apache/commons/dbcp/TesterResultSet.java
++++ b/src/test/org/apache/commons/dbcp/TesterResultSet.java
+@@ -969,4 +969,17 @@
+         throw new SQLException("Not implemented.");
+     }
+ /* JDBC_4_ANT_KEY_END */
++
++    /* JDBC_4_1_ANT_KEY_BEGIN */
++    @Override
++    public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
++        throw new SQLException("Not implemented.");
++    }
++
++    @Override
++    public <T> T getObject(String columnLabel, Class<T> type)
++            throws SQLException {
++        throw new SQLException("Not implemented.");
++    }
++    /* JDBC_4_1_ANT_KEY_END */
+ }
+--- a/src/test/org/apache/commons/dbcp/TesterDriver.java
++++ b/src/test/org/apache/commons/dbcp/TesterDriver.java
+@@ -116,6 +116,13 @@
+         return new DriverPropertyInfo[0];
+     }
+ 
++    /* JDBC_4_1_ANT_KEY_BEGIN */
++    @Override
++    public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
++        throw new java.sql.SQLFeatureNotSupportedException();
++    }
++    /* JDBC_4_1_ANT_KEY_END */
++
+     protected static final String CONNECT_STRING = "jdbc:apache:commons:testdriver";
+ 
+     // version numbers
+--- a/src/test/org/apache/commons/dbcp/TesterConnection.java
++++ b/src/test/org/apache/commons/dbcp/TesterConnection.java
+@@ -334,4 +334,32 @@
+         throw new SQLException("Not implemented.");
+     }
+ /* JDBC_4_ANT_KEY_END */
++
++    /* JDBC_4_1_ANT_KEY_BEGIN */
++    @Override
++    public void setSchema(String schema) throws SQLException {
++        throw new SQLException("Not implemented.");
++    }
++
++    @Override
++    public String getSchema() throws SQLException {
++        throw new SQLException("Not implemented.");
++    }
++
++    @Override
++    public void abort(java.util.concurrent.Executor executor) throws SQLException {
++        throw new SQLException("Not implemented.");
++    }
++
++    @Override
++    public void setNetworkTimeout(java.util.concurrent.Executor executor, int milliseconds)
++            throws SQLException {
++        throw new SQLException("Not implemented.");
++    }
++
++    @Override
++    public int getNetworkTimeout() throws SQLException {
++        throw new SQLException("Not implemented.");
++    }
++    /* JDBC_4_1_ANT_KEY_END */
+ }
+--- a/src/test/org/apache/commons/dbcp/datasources/ConnectionPoolDataSourceProxy.java
++++ b/src/test/org/apache/commons/dbcp/datasources/ConnectionPoolDataSourceProxy.java
+@@ -80,4 +80,10 @@
+         return tpc; 
+     }
+ 
++    /* JDBC_4_1_ANT_KEY_BEGIN */
++    @Override
++    public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
++        throw new java.sql.SQLFeatureNotSupportedException();
++    }
++    /* JDBC_4_1_ANT_KEY_END */
+ }

Added: trunk/libcommons-dbcp-java/debian/patches/03_exclude-transactions-tests.patch
===================================================================
--- trunk/libcommons-dbcp-java/debian/patches/03_exclude-transactions-tests.patch	                        (rev 0)
+++ trunk/libcommons-dbcp-java/debian/patches/03_exclude-transactions-tests.patch	2014-03-10 23:03:49 UTC (rev 17853)
@@ -0,0 +1,26 @@
+Description: Ignores the tests using geronimo-transaction which isn't available in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -272,6 +272,20 @@
+             <source>1.5</source>
+             <target>1.5</target>
+           </configuration>
++          <executions>
++            <execution>
++              <id>default-testCompile</id>
++              <phase>test-compile</phase>
++              <goals>
++                <goal>testCompile</goal>
++              </goals>
++              <configuration>
++                <testExcludes>
++                  <exclude>**/managed/**</exclude>
++                </testExcludes>
++              </configuration> 
++            </execution>
++          </executions>
+         </plugin>
+       </plugins>
+     </build>

Modified: trunk/libcommons-dbcp-java/debian/patches/series
===================================================================
--- trunk/libcommons-dbcp-java/debian/patches/series	2014-03-10 13:58:22 UTC (rev 17852)
+++ trunk/libcommons-dbcp-java/debian/patches/series	2014-03-10 23:03:49 UTC (rev 17853)
@@ -1,2 +1,3 @@
 0001-configure-source-and-target-version-1.5.patch
 02_java7_compat.patch
+03_exclude-transactions-tests.patch




More information about the pkg-java-commits mailing list