version update
This commit is contained in:
Tomas Repik
parent
83acebd55b
commit
72005b58ba
1
.gitignore
vendored
1
.gitignore
vendored
@ -5,3 +5,4 @@
|
||||
/1.5.3.tar.gz
|
||||
/1.5.4.tar.gz
|
||||
/1.5.5.tar.gz
|
||||
/2.0.2.tar.gz
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: mariadb-java-client
|
||||
Version: 1.5.5
|
||||
Release: 2%{?dist}
|
||||
Version: 2.0.2
|
||||
Release: 1%{?dist}
|
||||
Summary: Connects applications developed in Java to MariaDB and MySQL databases
|
||||
# added BSD license because of https://bugzilla.redhat.com/show_bug.cgi?id=1291558#c13
|
||||
License: BSD and LGPLv2+
|
||||
@ -15,11 +15,12 @@ BuildRequires: maven-local
|
||||
BuildRequires: mvn(net.java.dev.jna:jna)
|
||||
BuildRequires: mvn(net.java.dev.jna:jna-platform)
|
||||
BuildRequires: mvn(com.google.code.maven-replacer-plugin:replacer)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-javadoc-plugin)
|
||||
# fedora 25
|
||||
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||
BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
|
||||
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
|
||||
# since version 1.5.2 missing optional dependency
|
||||
# since version 1.5.2 missing optional dependency (windows)
|
||||
#BuildRequires: mvn(com.github.dblock.waffle:waffle-jna)
|
||||
|
||||
Requires: mariadb
|
||||
@ -48,15 +49,17 @@ done
|
||||
# remove missing optional dependency waffle-jna
|
||||
%pom_remove_dep com.github.dblock.waffle:waffle-jna
|
||||
# also remove the file using the removed plugin
|
||||
rm -f src/main/java/org/mariadb/jdbc/internal/packet/send/gssapi/WindowsNativeSspiAuthentication.java
|
||||
rm -f src/main/java/org/mariadb/jdbc/internal/com/send/gssapi/WindowsNativeSspiAuthentication.java
|
||||
# patch the sources so that the missing file is not making trouble
|
||||
%patch0 -p1
|
||||
%patch0 -p1
|
||||
|
||||
%mvn_file org.mariadb.jdbc:%{name} %{name}
|
||||
%mvn_alias org.mariadb.jdbc:%{name} mariadb:mariadb-connector-java
|
||||
|
||||
%pom_remove_plugin org.apache.maven.plugins:maven-checkstyle-plugin
|
||||
%pom_remove_plugin org.apache.maven.plugins:maven-source-plugin
|
||||
%pom_remove_plugin org.sonatype.plugins:nexus-staging-maven-plugin
|
||||
%pom_remove_plugin pl.project13.maven:git-commit-id-plugin
|
||||
|
||||
# remove preconfigured OSGi manifest file and generate OSGi manifest file
|
||||
# with maven-bundle-plugin instead of using maven-jar-plugin
|
||||
@ -105,6 +108,9 @@ rm src/main/resources/META-INF/MANIFEST.MF
|
||||
%license LICENSE
|
||||
|
||||
%changelog
|
||||
* Mon Jun 26 2017 Tomas Repik <trepik@redhat.com> - 2.0.2-1
|
||||
- version update
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
|
||||
@ -1,24 +1,35 @@
|
||||
--- mariadb-connector-j-1.5.2/src/main/java/org/mariadb/jdbc/internal/packet/send/SendGssApiAuthPacket.java 2016-08-31 01:52:20.000000000 +0200
|
||||
+++ SendGssApiAuthPacket.java 2016-09-14 12:12:17.784284202 +0200
|
||||
@@ -55,7 +55,6 @@
|
||||
import org.mariadb.jdbc.internal.packet.result.ErrorPacket;
|
||||
import org.mariadb.jdbc.internal.packet.send.gssapi.GssapiAuth;
|
||||
import org.mariadb.jdbc.internal.packet.send.gssapi.StandardGssapiAuthentication;
|
||||
-import org.mariadb.jdbc.internal.packet.send.gssapi.WindowsNativeSspiAuthentication;
|
||||
import org.mariadb.jdbc.internal.stream.PacketOutputStream;
|
||||
import org.mariadb.jdbc.internal.util.buffer.Buffer;
|
||||
import org.mariadb.jdbc.internal.util.dao.QueryException;
|
||||
@@ -85,7 +84,7 @@
|
||||
String mechanisms = buffer.readString(Charset.forName("UTF-8"));
|
||||
From 560a30be0f79895d00868f7743da32302679343e Mon Sep 17 00:00:00 2001
|
||||
From: Tomas Repik <trepik@redhat.com>
|
||||
Date: Mon, 26 Jun 2017 13:56:47 +0200
|
||||
Subject: [PATCH] remove waffle-jna
|
||||
|
||||
---
|
||||
.../internal/com/send/SendGssApiAuthPacket.java | 31 +---------------------
|
||||
1 file changed, 1 insertion(+), 30 deletions(-)
|
||||
|
||||
diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/SendGssApiAuthPacket.java b/src/main/java/org/mariadb/jdbc/internal/com/send/SendGssApiAuthPacket.java
|
||||
index b739b54..65c4507 100644
|
||||
--- a/src/main/java/org/mariadb/jdbc/internal/com/send/SendGssApiAuthPacket.java
|
||||
+++ b/src/main/java/org/mariadb/jdbc/internal/com/send/SendGssApiAuthPacket.java
|
||||
@@ -56,7 +56,6 @@ import org.mariadb.jdbc.internal.com.read.Buffer;
|
||||
import org.mariadb.jdbc.internal.com.read.ErrorPacket;
|
||||
import org.mariadb.jdbc.internal.com.send.gssapi.GssapiAuth;
|
||||
import org.mariadb.jdbc.internal.com.send.gssapi.StandardGssapiAuthentication;
|
||||
-import org.mariadb.jdbc.internal.com.send.gssapi.WindowsNativeSspiAuthentication;
|
||||
import org.mariadb.jdbc.internal.io.input.PacketInputStream;
|
||||
import org.mariadb.jdbc.internal.io.output.PacketOutputStream;
|
||||
|
||||
@@ -88,7 +87,7 @@ public class SendGssApiAuthPacket extends AbstractAuthSwitchSendResponsePacket i
|
||||
String mechanisms = buffer.readStringNullEnd(StandardCharsets.UTF_8);
|
||||
if (mechanisms.equals("")) mechanisms = "Kerberos";
|
||||
|
||||
|
||||
- GssapiAuth gssapiAuth = getAuthenticationMethod();
|
||||
+ GssapiAuth gssapiAuth = new StandardGssapiAuthentication(packetFetcher, packSeq);
|
||||
gssapiAuth.authenticate(writer, serverPrincipalName, mechanisms);
|
||||
+ GssapiAuth gssapiAuth = new StandardGssapiAuthentication(reader, packSeq);
|
||||
gssapiAuth.authenticate(pos, serverPrincipalName, mechanisms);
|
||||
}
|
||||
|
||||
@@ -103,33 +102,5 @@
|
||||
throw new QueryException("Authentication exception", 1045, "28000", e);
|
||||
|
||||
@@ -106,33 +105,5 @@ public class SendGssApiAuthPacket extends AbstractAuthSwitchSendResponsePacket i
|
||||
throw new SQLException("Authentication exception", "28000", 1045, e);
|
||||
}
|
||||
}
|
||||
-
|
||||
@ -38,7 +49,7 @@
|
||||
- if (isWindows.booleanValue()) {
|
||||
- try {
|
||||
- Class.forName("waffle.windows.auth.impl.WindowsAuthProviderImpl");
|
||||
- return new WindowsNativeSspiAuthentication(packetFetcher, packSeq);
|
||||
- return new WindowsNativeSspiAuthentication(reader, packSeq);
|
||||
- } catch (ClassNotFoundException cle) {
|
||||
- //waffle not in the classpath
|
||||
- }
|
||||
@ -46,8 +57,11 @@
|
||||
- } catch (Exception cle) {
|
||||
- //jna jar's are not in classpath
|
||||
- }
|
||||
- return new StandardGssapiAuthentication(packetFetcher, packSeq);
|
||||
- return new StandardGssapiAuthentication(reader, packSeq);
|
||||
- }
|
||||
-
|
||||
}
|
||||
|
||||
|
||||
--
|
||||
2.9.4
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user