diff --git a/0002-Adjust-IVY-paths.patch b/0002-Adjust-IVY-paths.patch new file mode 100644 index 0000000..edcfb8e --- /dev/null +++ b/0002-Adjust-IVY-paths.patch @@ -0,0 +1,80 @@ +From 07fe18c259b12c725c12758e5ca32b88c840ba81 Mon Sep 17 00:00:00 2001 +From: Marek Goldmann +Date: Mon, 16 Dec 2013 11:27:28 +0100 +Subject: [PATCH] Adjust IVY paths + +--- + ivy.settings.xml | 10 ++++------ + ivy.xml | 13 +++++++------ + 2 files changed, 11 insertions(+), 12 deletions(-) + +diff --git a/ivy.settings.xml b/ivy.settings.xml +index 3ebabf1..a2d5426 100644 +--- a/ivy.settings.xml ++++ b/ivy.settings.xml +@@ -26,8 +26,10 @@ + artifactPattern="[organisation]/[module]/[type]s/[artifact]-[revision](-[classifier]).[ext]"/> + + +- +- ++ ++ ++ ++ + + +@@ -39,10 +41,6 @@ + pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/> + + +- +- +- +- + + + +diff --git a/ivy.xml b/ivy.xml +index d4ad55e..0de4366 100644 +--- a/ivy.xml ++++ b/ivy.xml +@@ -98,9 +98,10 @@ + + + +- ++ ++ + +- ++ + + + +@@ -117,8 +118,8 @@ + + + +- +- ++ ++ + + + +@@ -188,8 +189,8 @@ + + + +- +- ++ ++ + + + +-- +1.8.4.2 + diff --git a/ironjacamar-1.3.4-remove-ambiguous-reference-to-tracef.patch b/ironjacamar-1.3.4-remove-ambiguous-reference-to-tracef.patch new file mode 100644 index 0000000..eb6af8e --- /dev/null +++ b/ironjacamar-1.3.4-remove-ambiguous-reference-to-tracef.patch @@ -0,0 +1,24 @@ +diff -Nru ironjacamar-ironjacamar-1.3.4.Final/adapters/src/main/java/org/jboss/jca/adapters/jdbc/extensions/db2/DB2ExceptionSorter.java ironjacamar-ironjacamar-1.3.4.Final.tracef/adapters/src/main/java/org/jboss/jca/adapters/jdbc/extensions/db2/DB2ExceptionSorter.java +--- ironjacamar-ironjacamar-1.3.4.Final/adapters/src/main/java/org/jboss/jca/adapters/jdbc/extensions/db2/DB2ExceptionSorter.java 2016-03-29 11:13:27.000000000 +0200 ++++ ironjacamar-ironjacamar-1.3.4.Final.tracef/adapters/src/main/java/org/jboss/jca/adapters/jdbc/extensions/db2/DB2ExceptionSorter.java 2016-07-20 19:33:05.569716665 +0200 +@@ -72,7 +72,7 @@ + isFatal = true; + } + +- logger.tracef("Evaluated SQL error code %d isException returned %b", code, isFatal); ++ logger.tracef("Evaluated SQL error code %d isException returned %b", (Object) code, isFatal); + + return isFatal; + } +diff -Nru ironjacamar-ironjacamar-1.3.4.Final/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java ironjacamar-ironjacamar-1.3.4.Final.tracef/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java +--- ironjacamar-ironjacamar-1.3.4.Final/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java 2016-03-29 11:13:27.000000000 +0200 ++++ ironjacamar-ironjacamar-1.3.4.Final.tracef/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java 2016-07-20 19:38:34.107908565 +0200 +@@ -1143,7 +1143,7 @@ + if (wasTrackByTx) + { + log.tracef("afterCompletion(%d) isTrackByTx=%b for %s" +- , status, isTrackByTx(), TxConnectionListener.this); ++ , (Object) status, isTrackByTx(), TxConnectionListener.this); + + if (wasFreed(null)) + { diff --git a/ironjacamar-1.3.4.Final-Use-local-provided-IVY.patch b/ironjacamar-1.3.4.Final-Use-local-provided-IVY.patch new file mode 100644 index 0000000..e42ed04 --- /dev/null +++ b/ironjacamar-1.3.4.Final-Use-local-provided-IVY.patch @@ -0,0 +1,15 @@ +diff -Nru ironjacamar-ironjacamar-1.3.4.Final/build.xml ironjacamar-ironjacamar-1.3.4.Final.ivy/build.xml +--- ironjacamar-ironjacamar-1.3.4.Final/build.xml 2016-03-29 11:13:27.000000000 +0200 ++++ ironjacamar-ironjacamar-1.3.4.Final.ivy/build.xml 2016-07-01 23:06:50.425994323 +0200 +@@ -298,10 +298,7 @@ + Bootstrap Ivy + ================================= --> + +- +- ++ + +