packages/mysql-connector-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to version 8.0.33

Browse Source
This commit is contained in:
wang--ge 2024-01-17 14:59:14 +08:00
parent b27bd3a43a
commit c671c23f77
6 changed files with 297 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
mysql-connector-java-8.0.30.tar.gz
View File

Binary file not shown.

170
mysql-connector-java-8.0.33.pom Normal file
View File

@ -0,0 +1,170 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
Copyright (c) 2006, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License, version 2.0, as published by the
Free Software Foundation.
This program is also distributed with certain software (including but not
limited to OpenSSL) that is licensed under separate terms, as designated in a
particular file or component or in included license documentation. The
authors of MySQL hereby grant you an additional permission to link the
program and your derivative works with the separately licensed software that
they have included with MySQL.
Without limiting anything contained in the foregoing, this file, which is
part of MySQL Connector/J, is also subject to the Universal FOSS Exception,
version 1.0, a copy of which can be found at
http://oss.oracle.com/licenses/universal-foss-exception.
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
for more details.
You should have received a copy of the GNU General Public License along with
this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.33</version>
<distributionManagement>
<relocation>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<message>MySQL Connector/J artifacts moved to reverse-DNS compliant Maven 2+ coordinates.</message>
</relocation>
</distributionManagement>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<encoding>UTF-8</encoding>
<java.version>1.8</java.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.4.0</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-engine</artifactId>
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit-platform</artifactId>
<version>2.22.0</version>
</dependency>
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.18.1.GA</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
</dependency>
<dependency>
<groupId>com.mchange</groupId>
<artifactId>c3p0</artifactId>
<version>0.9.5.4</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.19.6</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.0</version>
<configuration>
<includes>
<include>**/test/java/*</include>
</includes>
</configuration>
<dependencies>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-surefire-provider</artifactId>
<version>1.3.2</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<sourceFileExcludes>
<sourceFileExclude>**/test/java/*</sourceFileExclude>
<sourceFileExclude>**/test/java/com/mysql/cj/result/SqlTimestampValueFactoryTest.java</sourceFileExclude>
<sourceFileExclude>**/test/java/testsuite/x/devapi/BaseTableTestCase.java</sourceFileExclude>
<sourceFileExclude>**/test/java/testsuite/x/devapi/CollectionFindTest.java</sourceFileExclude>
<sourceFileExclude>**/test/java/testsuite/x/devapi/*.java</sourceFileExclude>
<sourceFileExclude>**/test/java/testsuite/regression/*.java</sourceFileExclude>
<sourceFileExclude>**/test/java/testsuite/perf/*.java</sourceFileExclude>
<sourceFileExclude>**/test/java/testsuite/simple/*.java</sourceFileExclude>
<sourceFileExclude>**/test/java/com/mysql/cj/protocol/x/SyncMessageReaderTest.java</sourceFileExclude>
</sourceFileExcludes>
</configuration>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

BIN
mysql-connector-java-8.0.33.tar.gz Normal file
View File

Binary file not shown.

49
mysql-connector-java.spec
View File

@ -1,20 +1,32 @@
Summary: Official JDBC driver for MySQL Summary: Official JDBC driver for MySQL
Name: mysql-connector-java Name: mysql-connector-java
Version: 8.0.30 Version: 8.0.33
Release: 1 Release: 1
Epoch: 1 Epoch: 1
License: GPLv2 with exceptions License: GPLv2 with exceptions
URL: http://dev.mysql.com/downloads/connector/j/ URL: http://dev.mysql.com/downloads/connector/j/
Source0: https://github.com/mysql/mysql-connector-j/archive/%{version}/%{name}-%{version}.tar.gz Source0: https://github.com/mysql/mysql-connector-j/archive/%{version}/%{name}-%{version}.tar.gz
Source1: https://repo.maven.apache.org/maven2/mysql/mysql-connector-java/8.0.33/mysql-connector-java-8.0.33.pom
Patch1: remove-coverage-test.patch
Patch2: remove-authentication-plugin.patch Patch2: remove-authentication-plugin.patch
Patch3: remove-StatementsTest.patch Patch3: remove-StatementsTest.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: ant >= 1.6.0 ant-contrib >= 1.0 ant-junit apache-commons-logging c3p0 git BuildRequires: maven-local apache-commons-logging
BuildRequires: hibernate java-devel >= 1:1.6.0 javapackages-local jta >= 1.0 junit5 BuildRequires: hibernate java-devel >= 1:1.6.0 javapackages-local jta >= 1.0
BuildRequires: protobuf-java slf4j BuildRequires: java-17-openjdk-devel
BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api)
BuildRequires: mvn(com.google.protobuf:protobuf-java)
BuildRequires: mvn(org.junit.platform:junit-platform-engine)
BuildRequires: mvn(org.apache.maven.surefire:surefire-junit-platform)
BuildRequires: mvn(org.hamcrest:hamcrest)
BuildRequires: mvn(javassist:javassist)
BuildRequires: mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(com.mchange:c3p0)
BuildRequires: mvn(org.eclipse.aether:aether-connector-basic)
BuildRequires: mvn(org.eclipse.aether:aether-transport-wagon)
BuildRequires: mvn(org.apache.maven.wagon:wagon-http)
BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api)
Requires: jta >= 1.0 slf4j Requires: jta >= 1.0 slf4j
%description %description
@ -26,8 +38,13 @@ data, even in a heterogeneous environment. MySQL Connector/J is a Type
IV JDBC driver and has a complete JDBC feature set that supports the IV JDBC driver and has a complete JDBC feature set that supports the
capabilities of MySQL. capabilities of MySQL.
%package javadoc
Summary: Javadoc for mysql-connector-java
%description javadoc
Javadoc for mysql-connector-java
%prep %prep
%setup -q -n mysql-connector-j-%{version} %autosetup -p1 -n mysql-connector-j-%{version}
for file in README README.md; do for file in README README.md; do
sed -i.orig 's|\r||g' $file sed -i.orig 's|\r||g' $file
@ -35,31 +52,29 @@ for file in README README.md; do
rm $file.orig rm $file.orig
done done
sed -i 's/>@.*</>%{version}</' src/build/misc/pom.xml sed -i 's/>@.*</>%{version}</' src/build/misc/pom.xml
cp %{SOURCE1} ./pom.xml
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build %build
export CLASSPATH=$(build-classpath jdbc-stdext jta junit slf4j commons-logging.jar) export CLASSPATH=$(build-classpath jdbc-stdext jta junit slf4j commons-logging.jar)
rm -rf src/main/user-impl/java/com/mysql/cj/jdbc/integration/jboss rm -rf src/main/user-impl/java/com/mysql/cj/jdbc/integration/jboss
rm src/test/java/testsuite/regression/ConnectionRegressionTest.java rm src/test/java/testsuite/regression/StatementRegressionTest.java
rm src/test/java/testsuite/regression/DataSourceRegressionTest.java %mvn_build -b --xmvn-javadoc
rm src/test/java/testsuite/simple/StatementsTest.java
ant -Dcom.mysql.cj.build.jdk=%{java_home} \
-Dcom.mysql.cj.extra.libs=/usr/share/java \
test dist
%install %install
%mvn_file mysql:mysql-connector-java %{name} %mvn_file mysql:mysql-connector-java %{name}
%mvn_artifact src/build/misc/pom.xml build/%{name}-%{version}-SNAPSHOT/%{name}-%{version}-SNAPSHOT.jar
%mvn_install %mvn_install
%files -f .mfiles %files -f .mfiles
%doc CHANGES README README.md %doc CHANGES README README.md
%license LICENSE %license LICENSE
%files javadoc -f .mfiles-javadoc
%license LICENSE
%changelog %changelog
* Wed Jan 17 2024 Ge Wang <wang__ge@126.com> - 1:8.0.33-1
- UPgrade to 8.0.33
* Tue Sep 26 2023 xu_ping <707078654@qq.com> - 1:8.0.30-1 * Tue Sep 26 2023 xu_ping <707078654@qq.com> - 1:8.0.30-1
- Upgrade to 8.0.30 - Upgrade to 8.0.30

142
remove-authentication-plugin.patch
View File

@ -2,16 +2,16 @@ From 47793b89300a19c5fd13b781f03dd580fc0186a6 Mon Sep 17 00:00:00 2001
From: Ondrej Dubaj <odubaj@redhat.com> From: Ondrej Dubaj <odubaj@redhat.com>
Date: Tue, 18 Jan 2022 14:58:57 +0100 Date: Tue, 18 Jan 2022 14:58:57 +0100
Subject: [PATCH] remove AuthenticationOciClient plugin due to missing oracle dependency Subject: [PATCH] remove AuthenticationOciClient plugin due to missing oracle dependency
--- ---
.../a/NativeAuthenticationProvider.java | 2 - .../a/NativeAuthenticationProvider.java | 2 -
.../AuthenticationOciClient.java | 177 ------------------ .../AuthenticationOciClient.java | 218 ------------------
.../cj/LocalizedErrorMessages.properties | 6 - .../cj/LocalizedErrorMessages.properties | 12 -
3 files changed, 185 deletions(-) 3 files changed, 232 deletions(-)
delete mode 100644 src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java delete mode 100644 src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java
diff --git a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java b/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java diff --git a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java b/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java
index 0d94061d..58bbf23b 100644 index b9a8ca6..3d5f145 100644
--- a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java --- a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java
+++ b/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java +++ b/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java
@@ -58,7 +58,6 @@ import com.mysql.cj.protocol.a.NativeConstants.StringSelfDataType; @@ -58,7 +58,6 @@ import com.mysql.cj.protocol.a.NativeConstants.StringSelfDataType;
@ -22,7 +22,7 @@ index 0d94061d..58bbf23b 100644
import com.mysql.cj.protocol.a.authentication.CachingSha2PasswordPlugin; import com.mysql.cj.protocol.a.authentication.CachingSha2PasswordPlugin;
import com.mysql.cj.protocol.a.authentication.MysqlClearPasswordPlugin; import com.mysql.cj.protocol.a.authentication.MysqlClearPasswordPlugin;
import com.mysql.cj.protocol.a.authentication.MysqlNativePasswordPlugin; import com.mysql.cj.protocol.a.authentication.MysqlNativePasswordPlugin;
@@ -256,7 +255,6 @@ public class NativeAuthenticationProvider implements AuthenticationProvider<Nati @@ -257,7 +256,6 @@ public class NativeAuthenticationProvider implements AuthenticationProvider<Nati
pluginsToInit.add(new MysqlOldPasswordPlugin()); pluginsToInit.add(new MysqlOldPasswordPlugin());
pluginsToInit.add(new AuthenticationLdapSaslClientPlugin()); pluginsToInit.add(new AuthenticationLdapSaslClientPlugin());
pluginsToInit.add(new AuthenticationKerberosClient()); pluginsToInit.add(new AuthenticationKerberosClient());
@ -32,10 +32,10 @@ index 0d94061d..58bbf23b 100644
// plugins from authenticationPluginClasses connection parameter // plugins from authenticationPluginClasses connection parameter
diff --git a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java b/src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java diff --git a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java b/src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java
deleted file mode 100644 deleted file mode 100644
index 473e532f..00000000 index 4fe5d32..0000000
--- a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java --- a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java
+++ /dev/null +++ /dev/null
@@ -1,177 +0,0 @@ @@ -1,218 +0,0 @@
-/* -/*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. - * Copyright (c) 2021, 2022, Oracle and/or its affiliates.
- * - *
@ -70,6 +70,7 @@ index 473e532f..00000000
-import java.io.IOException; -import java.io.IOException;
-import java.nio.charset.Charset; -import java.nio.charset.Charset;
-import java.nio.file.Files; -import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths; -import java.nio.file.Paths;
-import java.security.interfaces.RSAPrivateKey; -import java.security.interfaces.RSAPrivateKey;
-import java.util.Base64; -import java.util.Base64;
@ -100,8 +101,11 @@ index 473e532f..00000000
- -
- protected Protocol<NativePacketPayload> protocol = null; - protected Protocol<NativePacketPayload> protocol = null;
- private MysqlCallbackHandler usernameCallbackHandler = null; - private MysqlCallbackHandler usernameCallbackHandler = null;
- private String fingerprint = null; - private String configFingerprint = null;
- private String configKeyFile = null;
- private String configSecurityTokenFile = null;
- private RSAPrivateKey privateKey = null; - private RSAPrivateKey privateKey = null;
- private byte[] token = null;
- -
- @Override - @Override
- public void init(Protocol<NativePacketPayload> prot, MysqlCallbackHandler cbh) { - public void init(Protocol<NativePacketPayload> prot, MysqlCallbackHandler cbh) {
@ -111,7 +115,7 @@ index 473e532f..00000000
- -
- @Override - @Override
- public void reset() { - public void reset() {
- this.fingerprint = null; - this.configFingerprint = null;
- this.privateKey = null; - this.privateKey = null;
- } - }
- -
@ -161,74 +165,118 @@ index 473e532f..00000000
- return true; - return true;
- } - }
- -
- loadOciConfig();
- initializePrivateKey(); - initializePrivateKey();
- initializeToken();
- -
- byte[] nonce = fromServer.readBytes(StringSelfDataType.STRING_EOF); - byte[] nonce = fromServer.readBytes(StringSelfDataType.STRING_EOF);
- byte[] signature = ExportControlled.sign(nonce, this.privateKey); - byte[] signature = ExportControlled.sign(nonce, this.privateKey);
- if (signature == null) { - if (signature == null) {
- signature = new byte[0]; - signature = new byte[0];
- } - }
- String payload = String.format("{\"fingerprint\":\"%s\", \"signature\":\"%s\"}", this.fingerprint, Base64.getEncoder().encodeToString(signature)); - String payload = String.format("{\"fingerprint\":\"%s\", \"signature\":\"%s\", \"token\":\"%s\"}", this.configFingerprint,
- Base64.getEncoder().encodeToString(signature), new String(this.token));
- toServer.add(new NativePacketPayload(payload.getBytes(Charset.defaultCharset()))); - toServer.add(new NativePacketPayload(payload.getBytes(Charset.defaultCharset())));
- return true; - return true;
- } - }
- -
- private void loadOciConfig() {
- ConfigFile configFile;
- try {
- String configFilePath = this.protocol.getPropertySet().getStringProperty(PropertyKey.ociConfigFile.getKeyName()).getStringValue();
- String configProfile = this.protocol.getPropertySet().getStringProperty(PropertyKey.ociConfigProfile.getKeyName()).getStringValue();
- if (StringUtils.isNullOrEmpty(configFilePath)) {
- configFile = ConfigFileReader.parseDefault(configProfile);
- } else if (Files.exists(Paths.get(configFilePath))) {
- configFile = ConfigFileReader.parse(configFilePath, configProfile);
- } else {
- throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.ConfigFileNotFound"));
- }
- } catch (NoClassDefFoundError e) {
- throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.OciSdkNotFound"), e);
- } catch (IOException e) {
- throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.OciConfigFileError"), e);
- } catch (IllegalArgumentException e) {
- throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.ProfileNotFound"), e);
- }
-
- this.configFingerprint = configFile.get("fingerprint");
- if (StringUtils.isNullOrEmpty(this.configFingerprint)) {
- throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.OciConfigFileMissingEntry"));
- }
- this.configKeyFile = configFile.get("key_file");
- if (StringUtils.isNullOrEmpty(this.configKeyFile)) {
- throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.OciConfigFileMissingEntry"));
- }
- this.configSecurityTokenFile = configFile.get("security_token_file");
- }
-
- private void initializePrivateKey() { - private void initializePrivateKey() {
- if (this.privateKey != null) { - if (this.privateKey != null) {
- // Already initialized. - // Already initialized.
- return; - return;
- } - }
-
- ConfigFile configFile;
- try { - try {
- String configFilePath = this.protocol.getPropertySet().getStringProperty(PropertyKey.ociConfigFile.getKeyName()).getStringValue(); - Path keyFilePath = Paths.get(this.configKeyFile);
- if (StringUtils.isNullOrEmpty(configFilePath)) { - if (Files.notExists(keyFilePath)) {
- configFile = ConfigFileReader.parseDefault(); - throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.PrivateKeyNotFound"));
- } else if (Files.exists(Paths.get(configFilePath))) {
- configFile = ConfigFileReader.parse(configFilePath);
- } else {
- throw ExceptionFactory.createException("configuration file does not exist");
- } - }
- } catch (NoClassDefFoundError e) { - String key = new String(Files.readAllBytes(keyFilePath));
- throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.SdkNotFound"), e);
- } catch (IOException e) {
- throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.OciConfigFileError"), e);
- }
- this.fingerprint = configFile.get("fingerprint");
- if (StringUtils.isNullOrEmpty(this.fingerprint)) {
- throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.OciConfigFileMissingEntry"));
- }
- String keyFilePath = configFile.get("key_file");
- if (StringUtils.isNullOrEmpty(keyFilePath)) {
- throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.OciConfigFileMissingEntry"));
- }
-
- try {
- String key = new String(Files.readAllBytes(Paths.get(keyFilePath)), Charset.defaultCharset());
- this.privateKey = ExportControlled.decodeRSAPrivateKey(key); - this.privateKey = ExportControlled.decodeRSAPrivateKey(key);
- } catch (IOException e) { - } catch (IOException e) {
- throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.PrivateKeyNotFound"), e); - throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.FailedReadingPrivateKey"), e);
- } catch (RSAException | IllegalArgumentException e) { - } catch (RSAException | IllegalArgumentException e) {
- throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.PrivateKeyNotValid"), e); - throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.PrivateKeyNotValid"), e);
- } - }
- } - }
-
- private void initializeToken() {
- if (this.token != null) {
- // Already initialized.
- return;
- }
- if (StringUtils.isNullOrEmpty(this.configSecurityTokenFile)) {
- this.token = new byte[0];
- return;
- }
- try {
- Path securityTokenFilePath = Paths.get(this.configSecurityTokenFile);
- if (Files.notExists(securityTokenFilePath)) {
- throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.SecurityTokenFileNotFound"));
- }
- long size = Files.size(securityTokenFilePath);
- if (size > 10240) { // Fail if above 10KB.
- throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.SecurityTokenTooBig"));
- }
- this.token = Files.readAllBytes(Paths.get(this.configSecurityTokenFile));
- } catch (IOException e) {
- throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.FailedReadingSecurityTokenFile"), e);
- }
- }
-} -}
diff --git a/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties b/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties diff --git a/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties b/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties
index e4709a75..d29cdeb3 100644 index 786c4cc..6268362 100644
--- a/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties --- a/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties
+++ b/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties +++ b/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties
@@ -50,12 +50,6 @@ AuthenticationLdapSaslClientPlugin.MissingLdapServerHostname=An LDAP Server host @@ -49,18 +49,6 @@ AuthenticationLdapSaslClientPlugin.MissingLdapServerHostname=An LDAP Server host
AuthenticationLdapSaslClientPlugin.FailCreateSaslClient=Failed creating a SASL client for the authentication mechanism ''{0}''. AuthenticationLdapSaslClientPlugin.FailCreateSaslClient=Failed creating a SASL client for the authentication mechanism ''{0}''.
AuthenticationLdapSaslClientPlugin.ErrProcessingAuthIter=Error while processing an authentication iteration for the authentication mechanism ''{0}''. AuthenticationLdapSaslClientPlugin.ErrProcessingAuthIter=Error while processing an authentication iteration for the authentication mechanism ''{0}''.
-AuthenticationOciClientPlugin.SdkNotFound=The OCI SDK could not be found or is not installed. -AuthenticationOciClientPlugin.ConfigFileNotFound=OCI configuration file not found.
-AuthenticationOciClientPlugin.OciConfigFileError=OCI configuration file could not be read. -AuthenticationOciClientPlugin.OciSdkNotFound=The OCI SDK cannot be found or it is not installed.
-AuthenticationOciClientPlugin.OciConfigFileMissingEntry=OCI configuration file does not contain a ''fingerprint'' or ''key_file'' entry. -AuthenticationOciClientPlugin.OciConfigFileError=The OCI configuration file cannot be read.
-AuthenticationOciClientPlugin.PrivateKeyNotFound=Private key could not be found at location given by OCI configuration entry ''key_file''. -AuthenticationOciClientPlugin.ProfileNotFound=The specified profile is not found in the OCI configuration file.
-AuthenticationOciClientPlugin.PrivateKeyNotValid=OCI configuration entry ''key_file'' does not reference a valid key file. -AuthenticationOciClientPlugin.OciConfigFileMissingEntry=The OCI configuration file does not contain a ''fingerprint'' or ''key_file'' entry.
-AuthenticationOciClientPlugin.PrivateKeyNotFound=The private key cannot be found at the location referenced in the OCI configuration entry ''key_file''.
-AuthenticationOciClientPlugin.FailedReadingPrivateKey=Failed reading the private key file referenced in the OCI configuration entry ''key_file''.
-AuthenticationOciClientPlugin.PrivateKeyNotValid=The OCI configuration entry ''key_file'' does not reference a valid key file.
-AuthenticationOciClientPlugin.SecurityTokenFileNotFound=The security token file cannot be found at the location referenced in the OCI configuration entry ''security_token_file''.
-AuthenticationOciClientPlugin.SecurityTokenTooBig=Invalid security token file. File size above 10 KB.
-AuthenticationOciClientPlugin.FailedReadingSecurityTokenFile=Failed reading the security token file referenced in the OCI configuration entry ''security_token_file''.
- -
AuthenticationProvider.BadAuthenticationPlugin=Unable to load authentication plugin ''{0}''.
AuthenticationProvider.BadDefaultAuthenticationPlugin=Improper value "{0}" for property ''defaultAuthenticationPlugin''. AuthenticationProvider.BadDefaultAuthenticationPlugin=Improper value "{0}" for property ''defaultAuthenticationPlugin''.
AuthenticationProvider.DefaultAuthenticationPluginIsNotListed=Default authentication plugin "{0}" is neither one of the built-in plugins nor one of the plugins listed in ''authenticationPlugins''. AuthenticationProvider.DefaultAuthenticationPluginIsNotListed=Default authentication plugin "{0}" is neither one of the built-in plugins nor one of the plugins listed in ''authenticationPlugins''.
AuthenticationProvider.BadDisabledAuthenticationPlugin=Can''t disable the default authentication plugin. Either remove "{0}" from the disabled authentication plugins list, or choose a different default authentication plugin.
-- --
2.35.1 2.33.0

191
remove-coverage-test.patch
View File

@ -1,191 +0,0 @@
From cde027a4886ac1160ac42a6e4ba1fa2d271009be Mon Sep 17 00:00:00 2001
From: Ondrej Dubaj <odubaj@redhat.com>
Date: Thu, 28 Jul 2022 09:54:06 +0200
Subject: [PATCH] Remove coverage test
---
build.xml | 162 ------------------------------------------------------
1 file changed, 162 deletions(-)
diff --git a/build.xml b/build.xml
index 8c4e9f5d..3d13bf45 100644
--- a/build.xml
+++ b/build.xml
@@ -1279,82 +1279,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
</condition>
<echo>${com.mysql.cj.testsuite.message.test.mode}</echo>
- <local name="com.mysql.cj.testsuite.test.coverage" />
- <condition property="com.mysql.cj.testsuite.test.coverage" value="true" else="false">
- <isset property="com.mysql.cj.coverage.result.dir.final" />
- </condition>
-
- <local name="com.mysql.cj.testsuite.test.coverage.jvmargfinal" />
- <condition property="com.mysql.cj.testsuite.test.coverage.jvmargfinal"
- value="${com.mysql.cj.testsuite.test.coverage.jvmarg}"
- else="-Dcoverage=disabled">
- <and>
- <isset property="com.mysql.cj.testsuite.test.coverage.jvmarg" />
- <not>
- <equals arg1="${com.mysql.cj.testsuite.test.coverage.jvmarg}" arg2="" />
- </not>
- </and>
- </condition>
-
- <!-- ant 1.10.10 and above print report summaries to the console from where test counts can be retrieved. -->
- <antversion property="com.mysql.cj.testsuite.ant.version" atleast="1.10.10" />
-
- <junitlauncher haltOnFailure="false" printSummary="true" failureProperty="com.mysql.cj.testsuite.junit.fail">
- <classpath refid="com.mysql.cj.testsuite.build.classpath" />
-
- <test if="${com.mysql.cj.testsuite.test.methods.enabled}"
- name="${com.mysql.cj.testsuite.test.class}"
- methods="${com.mysql.cj.testsuite.test.methods}"
- outputdir="${com.mysql.cj.testsuite.junit.results}">
- <fork>
- <jvmarg value="-Dfile.encoding=UTF-8" />
- <jvmarg value="-Xmx1024m" />
- <jvmarg value="${com.mysql.cj.testsuite.test.coverage.jvmargfinal}" />
- <syspropertyset refid="junit.system.properties" />
- </fork>
- <listener classname="testsuite.JUnitSummary" unless="com.mysql.cj.testsuite.ant.version" />
- <listener type="legacy-xml" sendSysOut="true" sendSysErr="true" />
- <listener type="legacy-plain" sendSysOut="true" sendSysErr="true" />
- </test>
-
- <test if="com.mysql.cj.testsuite.test.class"
- unless="com.mysql.cj.testsuite.test.methods"
- name="${com.mysql.cj.testsuite.test.class}"
- outputdir="${com.mysql.cj.testsuite.junit.results}">
- <fork>
- <jvmarg value="-Dfile.encoding=UTF-8" />
- <jvmarg value="-Xmx1024m" />
- <jvmarg value="${com.mysql.cj.testsuite.test.coverage.jvmargfinal}" />
- <syspropertyset refid="junit.system.properties" />
- </fork>
- <listener classname="testsuite.JUnitSummary" unless="com.mysql.cj.testsuite.ant.version" />
- <listener type="legacy-xml" sendSysOut="true" sendSysErr="true" />
- <listener type="legacy-plain" sendSysOut="true" sendSysErr="true" />
- </test>
-
- <testclasses unless="com.mysql.cj.testsuite.test.class" outputdir="${com.mysql.cj.testsuite.junit.results}">
- <fileset dir="${com.mysql.cj.testsuite.build.dir}/${com.mysql.cj.build.driver.fullName}">
- <include name="**/*Test.class" />
- <exclude name="**/perf/*.class" />
- </fileset>
- <fork>
- <jvmarg value="-Dfile.encoding=UTF-8" />
- <jvmarg value="-Xmx1024m" />
- <jvmarg value="${com.mysql.cj.testsuite.test.coverage.jvmargfinal}" />
- <syspropertyset refid="junit.system.properties" />
- </fork>
- <listener classname="testsuite.JUnitSummary" unless="com.mysql.cj.testsuite.ant.version" />
- <listener type="legacy-xml" sendSysOut="true" sendSysErr="true" />
- <listener type="legacy-plain" sendSysOut="true" sendSysErr="true" />
- </testclasses>
- </junitlauncher>
-
- <junitreport todir="${com.mysql.cj.testsuite.junit.results}/report">
- <fileset dir="${com.mysql.cj.testsuite.junit.results}">
- <include name="**/TEST-*.xml" />
- </fileset>
- <report styledir="${junit.styledir}" format="frames" todir="${com.mysql.cj.testsuite.junit.results}/report" />
- </junitreport>
<!-- Don't fail the build if we're doing coverage test. -->
<fail message="Tests failed. Check logs and/or reports in '${com.mysql.cj.testsuite.junit.results}'.">
@@ -1367,92 +1291,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
</target>
- <!-- ********************************* -->
- <!-- ***** TESTING CODE COVERAGE ***** -->
- <!-- ********************************* -->
-
-
- <target name="test-coverage" description="Runs tests collecting coverage results." depends="-setup-test-coverage-agent, test" />
-
-
- <target name="-set-test-coverage-defaults" depends="-extra-libs-check">
- <condition property="com.mysql.cj.coverage.result.dir.final"
- value="${com.mysql.cj.coverage.result.dir}"
- else="${com.mysql.cj.testsuite.build.dir}/coverage">
- <isset property="com.mysql.cj.coverage.result.dir" />
- </condition>
- <condition property="com.mysql.cj.coverage.result.name.final" value="${com.mysql.cj.coverage.result.name}" else="jacoco.exec">
- <isset property="com.mysql.cj.coverage.result.name" />
- </condition>
-
- <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml">
- <classpath>
- <fileset dir="${com.mysql.cj.extra.libs}">
- <include name="**/jacocoant.jar" />
- </fileset>
- </classpath>
- </taskdef>
- </target>
-
-
- <target name="-setup-test-coverage-agent" depends="-set-test-coverage-defaults">
- <jacoco:agent destfile="${com.mysql.cj.coverage.result.dir.final}/${com.mysql.cj.coverage.result.name.final}"
- property="com.mysql.cj.testsuite.test.coverage.jvmarg" />
- </target>
-
-
- <!-- *********************************** -->
- <!-- ***** REPORTING CODE COVERAGE ***** -->
- <!-- *********************************** -->
-
-
- <target name="report-coverage"
- depends="-set-report-coverage-defaults, -jacoco-merge"
- description="Merges coverage results and creates HTML coverage report.">
- <jacoco:report>
- <executiondata>
- <file file="${com.mysql.cj.coverage.merge.result.final}" />
- </executiondata>
-
- <structure name="Connector/J classes">
- <classfiles>
- <fileset dir="${com.mysql.cj.build.dir.driver}">
- <include name="com/mysql/cj/**" />
- <exclude name="com/mysql/cj/x/protobuf/**" />
- </fileset>
- </classfiles>
- <sourcefiles encoding="UTF-8">
- <fileset dir="${com.mysql.cj.build.dir.driver}">
- <include name="com/mysql/cj/**" />
- <exclude name="com/mysql/cj/x/protobuf/**" />
- </fileset>
- </sourcefiles>
- </structure>
-
- <html destdir="${com.mysql.cj.coverage.report.dir.final}" />
- </jacoco:report>
- </target>
-
-
- <target name="-jacoco-merge" depends="-set-report-coverage-defaults" if="com.mysql.cj.coverage.merge.files">
- <jacoco:merge destfile="${com.mysql.cj.coverage.merge.result.final}">
- <fileset dir="${com.mysql.cj.coverage.result.dir.final}" includes="${com.mysql.cj.coverage.merge.files}" />
- </jacoco:merge>
- </target>
-
-
- <target name="-set-report-coverage-defaults" depends="-set-test-coverage-defaults">
- <condition property="com.mysql.cj.coverage.merge.result.final"
- value="${com.mysql.cj.coverage.merge.result}"
- else="${com.mysql.cj.coverage.result.dir.final}/jacoco.exec">
- <isset property="com.mysql.cj.coverage.merge.result" />
- </condition>
- <condition property="com.mysql.cj.coverage.report.dir.final"
- value="${com.mysql.cj.coverage.report.dir}"
- else="${com.mysql.cj.coverage.result.dir.final}/report">
- <isset property="com.mysql.cj.coverage.report.dir" />
- </condition>
- </target>
<!-- ***************************** -->
--
2.37.1