[btm: 1/2] Update to 2.1.2 and patch for Java 7 build
Andy Grimm
arg at fedoraproject.org
Fri Jan 13 19:24:08 UTC 2012
commit c37ed50c741285729d039957905a6496f45c2eb0
Author: Andy Grimm <agrimm at gmail.com>
Date: Fri Jan 13 14:18:34 2012 -0500
Update to 2.1.2 and patch for Java 7 build
.gitignore | 1 +
btm-2.1.1.pom => btm-2.1.2.pom | 2 +-
btm-jdbc4.1.patch | 24 ++++++++++++++++++++++++
btm-parent-2.1.1.pom => btm-parent-2.1.2.pom | 18 ++++++++++--------
btm.spec | 15 ++++++++++-----
sources | 2 +-
6 files changed, 47 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 50aff2d..3009350 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/btm-dist-2.1.1.zip
+/btm-dist-2.1.2.zip
diff --git a/btm-2.1.1.pom b/btm-2.1.2.pom
similarity index 99%
rename from btm-2.1.1.pom
rename to btm-2.1.2.pom
index bbb753d..6bd33e8 100644
--- a/btm-2.1.1.pom
+++ b/btm-2.1.2.pom
@@ -4,7 +4,7 @@
<parent>
<groupId>org.codehaus.btm</groupId>
<artifactId>btm-parent</artifactId>
- <version>2.1.1</version>
+ <version>2.1.2</version>
</parent>
<groupId>org.codehaus.btm</groupId>
<artifactId>btm</artifactId>
diff --git a/btm-jdbc4.1.patch b/btm-jdbc4.1.patch
new file mode 100644
index 0000000..5c397c5
--- /dev/null
+++ b/btm-jdbc4.1.patch
@@ -0,0 +1,24 @@
+diff -urN btm-dist-2.1.2/src/bitronix/tm/resource/jdbc/lrc/LrcXADataSource.java btm-dist-2.1.2.new/src/bitronix/tm/resource/jdbc/lrc/LrcXADataSource.java
+--- btm-dist-2.1.2/src/bitronix/tm/resource/jdbc/lrc/LrcXADataSource.java 2011-09-19 19:28:28.000000000 -0400
++++ btm-dist-2.1.2.new/src/bitronix/tm/resource/jdbc/lrc/LrcXADataSource.java 2012-01-13 13:57:02.775853077 -0500
+@@ -125,4 +125,8 @@
+ public String toString() {
+ return "a JDBC LrcXADataSource on " + driverClassName + " with URL " + url;
+ }
++
++ public java.util.logging.Logger getParentLogger() throws SQLFeatureNotSupportedException {
++ throw new SQLFeatureNotSupportedException();
++ }
+ }
+diff -urN btm-dist-2.1.2/src/bitronix/tm/resource/jdbc/PoolingDataSource.java btm-dist-2.1.2.new/src/bitronix/tm/resource/jdbc/PoolingDataSource.java
+--- btm-dist-2.1.2/src/bitronix/tm/resource/jdbc/PoolingDataSource.java 2011-10-30 10:22:50.000000000 -0400
++++ btm-dist-2.1.2.new/src/bitronix/tm/resource/jdbc/PoolingDataSource.java 2012-01-13 13:56:24.017855716 -0500
+@@ -397,4 +397,8 @@
+ public void reset() throws Exception {
+ pool.reset();
+ }
++
++ public java.util.logging.Logger getParentLogger() throws SQLFeatureNotSupportedException {
++ throw new SQLFeatureNotSupportedException();
++ }
+ }
diff --git a/btm-parent-2.1.1.pom b/btm-parent-2.1.2.pom
similarity index 94%
rename from btm-parent-2.1.1.pom
rename to btm-parent-2.1.2.pom
index 0cd7bec..4e803bd 100644
--- a/btm-parent-2.1.1.pom
+++ b/btm-parent-2.1.2.pom
@@ -8,7 +8,7 @@
</parent>
<groupId>org.codehaus.btm</groupId>
<artifactId>btm-parent</artifactId>
- <version>2.1.1</version>
+ <version>2.1.2</version>
<packaging>pom</packaging>
<name>Bitronix Transaction Manager</name>
<inceptionYear>2006</inceptionYear>
@@ -59,47 +59,49 @@
<dependency>
<groupId>org.codehaus.btm</groupId>
<artifactId>btm</artifactId>
- <version>2.1.1</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.btm</groupId>
<artifactId>btm</artifactId>
- <version>2.1.1</version>
+ <version>${project.version}</version>
<classifier>test-sources</classifier>
</dependency>
<dependency>
<groupId>org.codehaus.btm</groupId>
<artifactId>btm</artifactId>
- <version>2.1.1</version>
+ <version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.codehaus.btm</groupId>
<artifactId>btm</artifactId>
- <version>2.1.1</version>
+ <version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.codehaus.btm</groupId>
<artifactId>btm-tomcat55-lifecycle</artifactId>
- <version>2.1.1</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.btm</groupId>
<artifactId>btm-jetty6-lifecycle</artifactId>
- <version>2.1.1</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.btm</groupId>
<artifactId>btm-jetty7-lifecycle</artifactId>
- <version>2.1.1</version>
+ <version>${project.version}</version>
</dependency>
+ <!-- this is the pom's JTA dependency -->
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
<version>1.1</version>
</dependency>
+ <!-- this is the dist's JTA dependency -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
diff --git a/btm.spec b/btm.spec
index a302fd4..565537f 100644
--- a/btm.spec
+++ b/btm.spec
@@ -1,15 +1,16 @@
Summary: Bitronix Transaction Manager
Name: btm
-Version: 2.1.1
-Release: 3%{?dist}
+Version: 2.1.2
+Release: 1%{?dist}
Epoch: 0
License: LGPLv3
URL: http://bitronix.be
Group: Development/Libraries
-Source0: http://bitronix.be/downloads/btm-dist-%{version}.zip
-Source1: http://repo1.maven.org/maven2/org/codehaus/btm/btm-parent/2.1.1/btm-parent-2.1.1.pom
-Source2: http://repo1.maven.org/maven2/org/codehaus/btm/btm/2.1.1/btm-2.1.1.pom
+Source0: http://bitronix.be/downloads/btm-dist-2.1.2.zip
+Source1: http://repo1.maven.org/maven2/org/codehaus/btm/btm-parent/2.1.2/btm-parent-2.1.2.pom
+Source2: http://repo1.maven.org/maven2/org/codehaus/btm/btm/2.1.2/btm-2.1.2.pom
Patch0: %{name}-use-shared-jars.patch
+Patch1: btm-jdbc4.1.patch
BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: ant >= 0:1.6
BuildRequires: junit
@@ -52,6 +53,7 @@ find -name '*.jar' -exec rm -f '{}' \;
%patch0 -p1
+%patch1 -p1
%build
ant build
@@ -85,6 +87,9 @@ install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
%doc %{_javadocdir}/*
%changelog
+* Wed Jan 11 2012 Andy Grimm <agrimm at gmail.com> - 0:2.1.2-1
+- Update to 2.1.2
+
* Thu Sep 07 2011 Andy Grimm <agrimm at gmail.com> - 0:2.1.1-3
- Fixes for package review
diff --git a/sources b/sources
index 43424f6..86f898a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df9e0b1745d7458b843f9f86da6c8d31 btm-dist-2.1.1.zip
+24db201d15095071ed21ddfec4f8fe25 btm-dist-2.1.2.zip
More information about the scm-commits
mailing list