rpms/mysql-connector-java
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update to 5.1.37

Browse source
This commit is contained in:
gil 2015-10-16 11:32:24 +02:00
commit 7a73c82626
5 changed files with 355 additions and 401 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -7,3 +7,4 @@
/mysql-connector-java-5.1.26-nojars.tar.xz
/mysql-connector-java-5.1.28-nojars.tar.xz
/mysql-connector-java-5.1.36-nojars.tar.xz
/mysql-connector-java-5.1.37-nojars.tar.xz

162
mysql-connector-java-build.patch → mysql-connector-java-5.1.37-build.patch
View file

@ -1,14 +1,15 @@
--- mysql-connector-java-5.1.36/build.xml.orig 2015-06-19 21:26:19.000000000 +0200
+++ mysql-connector-java-5.1.36/build.xml 2015-07-14 16:50:31.906927259 +0200
@@ -155,7 +155,6 @@ com.mysql.jdbc.noCleanBetweenCompiles=ye
diff -Nru mysql-connector-java-5.1.37/build.xml mysql-connector-java-5.1.37.build/build.xml
--- mysql-connector-java-5.1.37/build.xml 2015-10-06 17:24:38.000000000 +0200
+++ mysql-connector-java-5.1.37.build/build.xml 2015-10-16 11:12:51.624810809 +0200
@@ -165,7 +165,6 @@
</condition>
<!-- The following properties are needed for finding JDK5 and JDK6 needed for compile and can be passed on the command line to ant via -D switches. -->
<!-- The following properties are needed for finding JDK5 and JDK8 needed for compile and can be passed on the command line to ant via -D switches. -->
- <property name="com.mysql.jdbc.jdk5" value="/usr/lib/jvm/jdk1.5" />
<property name="com.mysql.jdbc.jdk6" value="/usr/lib/jvm/jdk1.6" />
<property name="com.mysql.jdbc.jdk8" value="/usr/lib/jvm/jdk1.8" />
<!-- The following property allows to point the location of third-party libraries we don't distribute. Default value points to src/lib so user could either
@@ -163,7 +162,7 @@ com.mysql.jdbc.noCleanBetweenCompiles=ye
@@ -173,7 +172,7 @@
<property name="com.mysql.jdbc.extra.libs" value="${sourceDir}/lib" />
<!-- The following property is needed for finding a JVM to execute the tests and can be passed on the command line to ant via -D switch. -->
@ -17,7 +18,24 @@
<!-- The following property is needed for building the docs and must be passed on the command line to ant via -D switch. -->
<property name="com.mysql.jdbc.docs.sourceDir" value="/tmp/connectorj/docs/prebuilt" />
@@ -208,10 +207,10 @@ com.mysql.jdbc.noCleanBetweenCompiles=ye
@@ -192,8 +191,14 @@
</path>
<path id="project.build.classpath">
- <fileset dir="${com.mysql.jdbc.extra.libs}">
- <include name="**/*.jar" />
+ <fileset dir="/usr/share/java">
+ <include name="hamcrest/all.jar" />
+ <include name="junit.jar" />
+ <include name="commons-logging.jar" />
+ <include name="slf4j/api.jar" />
+ <include name="jta.jar" />
+ <include name="c3p0/c3p0.jar" />
+ <include name="hibernate/hibernate-core.jar" />
</fileset>
<fileset dir="${buildDir}/${fullProdName}/lib">
@@ -218,10 +223,10 @@
</not>
</condition>
</fail>
@ -30,14 +48,14 @@
</not>
</condition>
</fail>
@@ -219,35 +218,7 @@ com.mysql.jdbc.noCleanBetweenCompiles=ye
@@ -229,34 +234,7 @@
<!-- Check for required JDKs for compilation. -->
- <target name="-compiler-check" depends="-jdk5-check, -jdk6-check" />
- <target name="-compiler-check" depends="-jdk5-check, -jdk8-check, -jre6-rtjar-check" />
-
-
- <!-- Check for required JDK5 for compilation of JDBC3 implementation. -->
- <!-- Check for required JDK5 for compilation of JDBC 3 implementation. -->
- <target name="-jdk5-check">
- <property name="com.mysql.jdbc.jdk5.java" value="${com.mysql.jdbc.jdk5}/bin/java" />
- <property name="com.mysql.jdbc.jdk5.javac" value="${com.mysql.jdbc.jdk5}/bin/javac" />
@ -52,7 +70,7 @@
- </exec>
-
- <fail message="Java 5 is required. Set the full path to this JDK home with the property 'com.mysql.jdbc.jdk5'. Default: '/usr/lib/jvm/jdk1.5').
-Java 6 (for JDBC4+ implementation) is also required. Set the full path to this JDK home with the property 'com.mysql.jdbc.jdk6'. Default: '/usr/lib/jvm/jdk1.6'.">
-Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this JDK home with the property 'com.mysql.jdbc.jdk8'. Default: '/usr/lib/jvm/jdk1.8'.">
- <condition>
- <not>
- <and>
@ -62,42 +80,36 @@
- </not>
- </condition>
- </fail>
- </target>
+ <target name="-compiler-check" depends="-jdk6-check" />
+ <target name="-compiler-check" depends="-jdk8-check, -jre6-rtjar-check">
</target>
<!-- Check for required JDK6 for compilation of JDBC4+ implementation. -->
@@ -267,10 +238,7 @@ Java 6 (for JDBC4+ implementation) is al
<fail message="Java 6 (for JDBC4+ implementation) is required. Set the full path to this JDK home with the property 'com.mysql.jdbc.jdk6'. Default: '/usr/lib/jvm/jdk1.6'.">
<condition>
<not>
- <and>
- <equals arg1="${jdk6checkexitstatus}" arg2="0" />
- <contains string="${com.mysql.jdbc.jdk6.version}" substring="java version &quot;1.6" casesensitive="true" />
- </and>
+ <equals arg1="${jdk6checkexitstatus}" arg2="0" />
</not>
</condition>
</fail>
@@ -332,7 +300,7 @@ Java 6 (for JDBC4+ implementation) is al
@@ -274,13 +252,10 @@
<arg value="-version" />
</exec>
- <fail message="Testing Connector/J requires a JVM 1.5 or higher. Set the path to this JVM (JRE or JDK) home with the property 'com.mysql.jdbc.testsuite.jvm'. Default: '${com.mysql.jdbc.jdk5}'.">
+ <fail message="Testing Connector/J requires a JVM 1.5 or higher. Set the path to this JVM (JRE or JDK) home with the property 'com.mysql.jdbc.testsuite.jvm'. Default: '${com.mysql.jdbc.jdk6}'.">
- <fail message="Java 8 (for JDBC 4+ implementation) is required. Set the full path to this JDK home with the property 'com.mysql.jdbc.jdk8'. Default: '/usr/lib/jvm/jdk1.8'.">
+ <fail message="Java 8 (for JDBC 4+ implementation) is required. Set the full path to this JDK home with the property 'com.mysql.jdbc.jdk8'. Default: '${com.mysql.jdbc.jdk8}'.">
<condition>
<not>
<equals arg1="${jvmcheckexitstatus}" arg2="0" />
@@ -775,37 +743,11 @@ Java 6 (for JDBC4+ implementation) is al
<!-- Compile the driver including JDBC3 and JDBC4+ implementations only. -->
- <and>
- <equals arg1="${jdk8checkexitstatus}" arg2="0" />
- <contains string="${com.mysql.jdbc.jdk8.version}" substring="java version &quot;1.8" casesensitive="true" />
- </and>
+ <equals arg1="${jdk8checkexitstatus}" arg2="0" />
</not>
</condition>
</fail>
@@ -810,39 +785,10 @@
<!-- Compile the driver including JDBC 3 and JDBC 4+ implementations only. -->
<target name="compile-driver"
description="Compiles driver including JDBC3 and JDBC4+ implementations only."
description="Compiles driver including JDBC 3 and JDBC 4+ implementations only."
- depends="-compile-driver-jdbc3, -compile-driver-jdbc4" />
-
-
- <!-- Compile JDBC3 implementation. -->
- <!-- Compile JDBC 3 implementation. -->
- <target name="-compile-driver-jdbc3" depends="init, -clean-output">
- <echo>Compiling MySQL Connector/J JDBC3 implementation with '${com.mysql.jdbc.jdk5}' to '${compiler.output}'</echo>
- <echo>Compiling MySQL Connector/J JDBC 3 implementation with '${com.mysql.jdbc.jdk5}' to '${compiler.output}'</echo>
-
- <javac sourcepath=""
- srcdir="${buildDir}/${fullProdName}"
@ -107,7 +119,9 @@
- fork="yes"
- executable="${com.mysql.jdbc.jdk5.javac}"
- compiler="modern"
- includeantruntime="false">
- includeantruntime="false"
- source="1.5"
- target="1.5">
- <include name="**/*.java" />
- <exclude name="testsuite/**" />
- <exclude name="com/mysql/jdbc/integration/**" />
@ -119,88 +133,112 @@
- <classpath refid="project.build.classpath" />
- </javac>
- </target>
-
+ depends="-compile-driver-jdbc4" />
<!-- Compile JDBC4+ implementation. -->
<!-- Compile JDBC 4+ implementation. -->
- <target name="-compile-driver-jdbc4" depends="-compile-driver-jdbc3">
+ <target name="-compile-driver-jdbc4">
<echo>Compiling MySQL Connector/J JDBC4+ implementation with '${com.mysql.jdbc.jdk6}' to '${compiler.output}'</echo>
<echo>Compiling MySQL Connector/J JDBC 4+ implementation with '${com.mysql.jdbc.jdk8}' to '${compiler.output}'</echo>
<javac sourcepath=""
@@ -830,7 +772,7 @@ Java 6 (for JDBC4+ implementation) is al
@@ -886,7 +832,7 @@
<target name="compile-testsuite"
description="Compiles driver including JDBC3 and JDBC4+ implementations and JUnit test suite."
description="Compiles driver including JDBC 3 and JDBC 4+ implementations and JUnit test suite."
depends="init, compile-driver">
- <echo>Compiling MySQL Connector/J testsuite with '${com.mysql.jdbc.jdk5}' to '${compiler.output}'</echo>
+ <echo>Compiling MySQL Connector/J testsuite with '${com.mysql.jdbc.jdk6}' to '${compiler.output}'</echo>
+ <echo>Compiling MySQL Connector/J testsuite with '${com.mysql.jdbc.jdk8}' to '${compiler.output}'</echo>
<javac sourcepath=""
srcdir="${buildDir}/${fullProdName}"
@@ -838,7 +780,7 @@ Java 6 (for JDBC4+ implementation) is al
@@ -894,11 +840,11 @@
deprecation="off"
debug="${debug.enable}"
fork="yes"
- executable="${com.mysql.jdbc.jdk5.javac}"
+ executable="${com.mysql.jdbc.jdk6.javac}"
+ executable="${com.mysql.jdbc.jdk8.javac}"
compiler="modern"
includeantruntime="false">
includeantruntime="false"
- source="1.5"
- target="1.5">
+ source="1.6"
+ target="1.6">
<include name="testsuite/**" />
@@ -870,7 +812,7 @@ Java 6 (for JDBC4+ implementation) is al
<exclude name="testsuite/requiresNonRedists/**" />
<exclude name="testsuite/**/jdbc4*/**" />
@@ -946,7 +892,7 @@
<!-- Compile c3p0 integration. -->
<target name="-compile-integration-c3p0" depends="compile-driver" if="com.mysql.jdbc.c3p0Present">
- <echo>Compiling MySQL Connector/J-c3p0 integration with '${com.mysql.jdbc.jdk5}' to '${compiler.output}'</echo>
+ <echo>Compiling MySQL Connector/J-c3p0 integration with '${com.mysql.jdbc.jdk6}' to '${compiler.output}'</echo>
+ <echo>Compiling MySQL Connector/J-c3p0 integration with '${com.mysql.jdbc.jdk8}' to '${compiler.output}'</echo>
<javac sourcepath=""
srcdir="${buildDir}/${fullProdName}"
@@ -878,7 +820,7 @@ Java 6 (for JDBC4+ implementation) is al
@@ -954,11 +900,11 @@
deprecation="off"
debug="${debug.enable}"
fork="yes"
- executable="${com.mysql.jdbc.jdk5.javac}"
+ executable="${com.mysql.jdbc.jdk6.javac}"
+ executable="${com.mysql.jdbc.jdk8.javac}"
compiler="modern"
includeantruntime="false">
includeantruntime="false"
- source="1.5"
- target="1.5">
+ source="1.6"
+ target="1.6">
<include name="com/mysql/jdbc/integration/c3p0/**" />
@@ -889,7 +831,7 @@ Java 6 (for JDBC4+ implementation) is al
<classpath refid="project.build.classpath" />
</javac>
@@ -967,7 +913,7 @@
<!-- Compile jBoss integration. -->
<target name="-compile-integration-jboss" depends="compile-driver" if="com.mysql.jdbc.jbossPresent">
- <echo>Compiling MySQL Connector/J-jboss integration with '${com.mysql.jdbc.jdk5}' to '${compiler.output}'</echo>
+ <echo>Compiling MySQL Connector/J-jboss integration with '${com.mysql.jdbc.jdk6}' to '${compiler.output}'</echo>
+ <echo>Compiling MySQL Connector/J-jboss integration with '${com.mysql.jdbc.jdk8}' to '${compiler.output}'</echo>
<javac sourcepath=""
srcdir="${buildDir}/${fullProdName}"
@@ -897,7 +839,7 @@ Java 6 (for JDBC4+ implementation) is al
@@ -975,11 +921,11 @@
deprecation="off"
debug="${debug.enable}"
fork="yes"
- executable="${com.mysql.jdbc.jdk5.javac}"
+ executable="${com.mysql.jdbc.jdk6.javac}"
+ executable="${com.mysql.jdbc.jdk8.javac}"
compiler="modern"
includeantruntime="false">
includeantruntime="false"
- source="1.5"
- target="1.5">
+ source="1.6"
+ target="1.6">
<include name="com/mysql/jdbc/integration/jboss/**" />
@@ -908,7 +850,7 @@ Java 6 (for JDBC4+ implementation) is al
<classpath refid="project.build.classpath" />
</javac>
@@ -988,7 +934,7 @@
<!-- Compile Log4j integration. -->
<target name="-compile-integration-log4j" depends="compile-driver" if="com.mysql.jdbc.log4jPresent">
- <echo>Compiling MySQL Connector/J-log4j integration with '${com.mysql.jdbc.jdk5}' to '${compiler.output}'</echo>
+ <echo>Compiling MySQL Connector/J-log4j integration with '${com.mysql.jdbc.jdk6}' to '${compiler.output}'</echo>
+ <echo>Compiling MySQL Connector/J-log4j integration with '${com.mysql.jdbc.jdk8}' to '${compiler.output}'</echo>
<javac sourcepath=""
srcdir="${buildDir}/${fullProdName}"
@@ -916,7 +858,7 @@ Java 6 (for JDBC4+ implementation) is al
@@ -996,11 +942,11 @@
deprecation="off"
debug="${debug.enable}"
fork="yes"
- executable="${com.mysql.jdbc.jdk5.javac}"
+ executable="${com.mysql.jdbc.jdk6.javac}"
+ executable="${com.mysql.jdbc.jdk8.javac}"
compiler="modern"
includeantruntime="false">
includeantruntime="false"
- source="1.5"
- target="1.5">
+ source="1.6"
+ target="1.6">
<include name="com/mysql/jdbc/log/Log4JLogger.java" />
@@ -1665,7 +1607,7 @@ Java 6 (for JDBC4+ implementation) is al
<classpath refid="project.build.classpath" />
</javac>
@@ -1788,7 +1734,7 @@
<sysproperty key="com.mysql.fabric.testsuite.shard2.port" value="${com.mysql.fabric.testsuite.shard2.port}" />
<classpath>
@ -209,7 +247,7 @@
<include name="**/*.jar" />
</fileset>
<fileset dir="${buildDir}/${fullProdName}/lib">
@@ -1752,7 +1694,7 @@ Java 6 (for JDBC4+ implementation) is al
@@ -1875,7 +1821,7 @@
<sysproperty key="com.mysql.fabric.testsuite.shard2.port" value="${com.mysql.fabric.testsuite.shard2.port}" />
<classpath>

526
mysql-connector-java-jdbc-4.1.patch → mysql-connector-java-5.1.37-jdbc4.1.patch
View file

File diff suppressed because it is too large Load diff

65
mysql-connector-java.spec
View file

@ -1,23 +1,22 @@
%global builddir build-mysql-jdbc
%global distdir dist-mysql-jdbc
Summary: Official JDBC driver for MySQL
Name: mysql-connector-java
Version: 5.1.36
Release: 1%{?dist}
Epoch: 1
# MySQL FLOSS Exception
License: GPLv2 with exceptions
URL: http://dev.mysql.com/downloads/connector/j/
Summary: Official JDBC driver for MySQL
Name: mysql-connector-java
Version: 5.1.37
Release: 1%{?dist}
Epoch: 1
License: GPLv2 with exceptions
URL: http://dev.mysql.com/downloads/connector/j/
Source0: %{name}-%{version}-nojars.tar.xz
# Mysql has a mirror redirector for its downloads
# You can get this tarball by following a link from:
# http://dev.mysql.com/get/Downloads/Connector-J/%{name}-%{version}.tar.gz
# http://dev.mysql.com/get/Downloads/Connector-J/%%{name}-%%{version}.tar.gz
#
# Following prebuilt jars and sources have been removed from the tarball:
#
# %{name}-%{version}-bin.jar
# %%{name}-%%{version}-bin.jar
# src/lib/c3p0-0.9.1-pre6.jar
# src/lib/c3p0-0.9.1-pre6.src.zip
# src/lib/jboss-common-jdbc-wrapper.jar
@ -25,33 +24,33 @@ URL: http://dev.mysql.com/downloads/connector/j/
# src/lib/slf4j-api-1.6.1.jar
#
# See http://bugs.mysql.com/bug.php?id=28512 for details.
Source0: %{name}-%{version}-nojars.tar.xz
# To make it easier a script generate-tarball.sh has been created:
# ./generate-tarball.sh version
# will create a new tarball compressed with xz and without those jar files.
Source1: generate-tarball.sh
Source1: generate-tarball.sh
# Patch to build with JDBC 4.1/Java 7
Patch0: %{name}-jdbc-4.1.patch
Patch1: %{name}-build.patch
Patch2: %{name}-hibernate.patch
Patch0: %{name}-5.1.37-jdbc4.1.patch
# Add system libraries
Patch1: %{name}-5.1.37-build.patch
Patch2: %{name}-hibernate.patch
BuildArch: noarch
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: ant >= 1.6.0
BuildRequires: ant-contrib >= 1.0
BuildRequires: bzr
BuildRequires: javapackages-local
BuildRequires: jta >= 1.0
BuildRequires: junit
BuildRequires: slf4j
BuildRequires: apache-commons-logging
BuildRequires: hibernate-core
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: ant >= 1.6.0
BuildRequires: ant-contrib >= 1.0
BuildRequires: bzr
BuildRequires: c3p0
BuildRequires: javapackages-local
BuildRequires: jta >= 1.0
BuildRequires: junit
BuildRequires: slf4j
BuildRequires: apache-commons-logging
BuildRequires: hibernate-core
Requires: jta >= 1.0
Requires: slf4j
Requires: jta >= 1.0
Requires: slf4j
%description
MySQL Connector/J is a native Java driver that converts JDBC (Java Database
@ -92,7 +91,8 @@ rm src/testsuite/simple/ReadOnlyCallableStatementTest.java
rm src/testsuite/simple/jdbc4/StatementsTest.java
ant -DbuildDir=%{builddir} -DdistDir=%{distdir} \
-Dcom.mysql.jdbc.jdk6=%{java_home} \
-Dcom.mysql.jdbc.jdk8=%{java_home} \
-Dcom.mysql.jdbc.jdk6=%{java_home}/jre/lib/rt.jar \
-Dcom.mysql.jdbc.extra.libs=/usr/share/java \
dist
@ -107,6 +107,9 @@ ant -DbuildDir=%{builddir} -DdistDir=%{distdir} \
%license COPYING
%changelog
* Fri Oct 16 2015 gil cattaneo <puntogil@libero.it> 1:5.1.37-1
- update to 5.1.37
* Thu Jun 25 2015 Jakub Dorňák <jdornak@redhat.com> - 1:5.1.36-1
- Rebase to version 5.1.36
Resolves rhbz#1061093

2
sources
View file

@ -1 +1 @@
c953cd2dbc9eef654f59f0323be9575e mysql-connector-java-5.1.36-nojars.tar.xz
0a277c3c19a187860b98dbf81fce1536 mysql-connector-java-5.1.37-nojars.tar.xz