Update version from 1.1.2 to 1.1.3 (#331)

Author: karenc-bq

CHANGELOG.md

@@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/#semantic-versioning-200).
 
+## [1.1.3] - 2023-01-05
+
+### Fixed
+* Removed "SNAPSHOT" from the full version name. [Issue 318](https://github.com/awslabs/aws-mysql-jdbc/issues/318)
+* Fixed incorrect driver classpath in README.md
+* Fixed failure detection interval in EFM
+
+### Added
+* Shading to -sources.jar to reflect the main jar which is shaded
+
 ## [1.1.2] - 2022-11-22
 
 ### Added
@@ -13,7 +23,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 * Upgraded dependency versions
 
 ### Fixed
-* Update FailoverConnectionPlugin license.
+* Updated FailoverConnectionPlugin license.
 * Fixed plugin factories package names in the README.
 * Resolved an issue where the driver attempts to query for the topology during a prepared transaction.[Issue 292](https://github.com/awslabs/aws-mysql-jdbc/issues/292)
 * Resolved an issue where distinct ClientPreparedStatement objects incorrectly have the same hashCode.[Issue 308](https://github.com/awslabs/aws-mysql-jdbc/issues/308)
@@ -98,6 +108,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Added
 * This driver is based on the MySQL 8.0.21 community driver. The driver is cluster aware for Amazon Aurora MySQL. It takes advantage of Amazon Aurora's fast failover capabilities, reducing failover times from minutes to seconds.
 
+[1.1.3]: https://github.com/awslabs/aws-mysql-jdbc/compare/1.1.2...1.1.3
 [1.1.2]: https://github.com/awslabs/aws-mysql-jdbc/compare/1.1.1...1.1.2
 [1.1.1]: https://github.com/awslabs/aws-mysql-jdbc/compare/1.1.0...1.1.1
 [1.1.0]: https://github.com/awslabs/aws-mysql-jdbc/compare/1.0.0...1.1.0

README.md

@@ -29,18 +29,18 @@ The AWS JDBC Driver for MySQL can be installed from pre-compiled packages that c
 
 **Example - Direct download with wget**
 ```bash
-wget https://github.com/awslabs/aws-mysql-jdbc/releases/download/1.1.2/aws-mysql-jdbc-1.1.2.jar
-cp aws-mysql-jdbc-1.1.2.jar /home/userx/libs/
-export CLASSPATH=$CLASSPATH:/home/userx/libs/aws-mysql-jdbc-1.1.2.jar
+wget https://github.com/awslabs/aws-mysql-jdbc/releases/download/1.1.3/aws-mysql-jdbc-1.1.3.jar
+cp aws-mysql-jdbc-1.1.3.jar /home/userx/libs/
+export CLASSPATH=$CLASSPATH:/home/userx/libs/aws-mysql-jdbc-1.1.3.jar
 ```
 
 **Upgrading to a newer version with wget**
 
-To upgrade the driver, replace the .jar file of your earlier driver with the new `.jar` file. After replacing the `.jar` file, update the CLASSPATH to include the name of the new file. For example, to upgrade to version 1.1.2:
+To upgrade the driver, replace the .jar file of your earlier driver with the new `.jar` file. After replacing the `.jar` file, update the CLASSPATH to include the name of the new file. For example, to upgrade to version 1.1.3:
 ```bash
-wget https://github.com/awslabs/aws-mysql-jdbc/releases/download/1.1.2/aws-mysql-jdbc-1.1.2.jar
-cp aws-mysql-jdbc-1.1.2.jar /home/userx/libs/
-export CLASSPATH=$CLASSPATH:/home/userx/libs/aws-mysql-jdbc-1.1.2.jar
+wget https://github.com/awslabs/aws-mysql-jdbc/releases/download/1.1.3/aws-mysql-jdbc-1.1.3.jar
+cp aws-mysql-jdbc-1.1.3.jar /home/userx/libs/
+export CLASSPATH=$CLASSPATH:/home/userx/libs/aws-mysql-jdbc-1.1.3.jar
 ```
 
 #### As a Maven dependency
@@ -52,20 +52,20 @@ You can use [Maven's dependency management](https://search.maven.org/search?q=g:
   <dependency>
     <groupId>software.aws.rds</groupId>
     <artifactId>aws-mysql-jdbc</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
   </dependency>
 </dependencies>
 ```
 
 **Upgrading to a newer version with Maven**
 
-To upgrade to a newer version of the driver, replace the version number identified in the `pom.xml` file with the newer driver version. For example, to upgrade to version 1.1.2, modify the file to include:
+To upgrade to a newer version of the driver, replace the version number identified in the `pom.xml` file with the newer driver version. For example, to upgrade to version 1.1.3, modify the file to include:
 ```xml
 <dependencies>
   <dependency>
     <groupId>software.aws.rds</groupId>
     <artifactId>aws-mysql-jdbc</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
   </dependency>
 </dependencies>
 ```
@@ -76,16 +76,16 @@ You can use [Gradle's dependency management](https://search.maven.org/search?q=g
 **Example - Gradle**
 ```gradle
 dependencies {
-    implementation group: 'software.aws.rds', name: 'aws-mysql-jdbc', version: '1.1.2'
+    implementation group: 'software.aws.rds', name: 'aws-mysql-jdbc', version: '1.1.3'
 }
 ```
 
 **Upgrading to a newer version with Gradle**
 
-To upgrade to a newer version of the driver, replace the version number identified in the application's ```build.gradle``` file with the newer driver version. For example, to upgrade to version 1.1.2:
+To upgrade to a newer version of the driver, replace the version number identified in the application's ```build.gradle``` file with the newer driver version. For example, to upgrade to version 1.1.3:
 ```gradle
 dependencies {
-    implementation group: 'software.aws.rds', name: 'aws-mysql-jdbc', version: '1.1.2'
+    implementation group: 'software.aws.rds', name: 'aws-mysql-jdbc', version: '1.1.3'
 }
 ```
 
@@ -95,9 +95,9 @@ To use the driver with an IDE (for example, IntelliJ), download the `.jar` file
 **Example - IntelliJ**
 
 ```bash
-wget https://github.com/awslabs/aws-mysql-jdbc/releases/download/1.1.2/aws-mysql-jdbc-1.1.2.jar
-cp aws-mysql-jdbc-1.1.2.jar /home/userx/libs/
-export CLASSPATH=$CLASSPATH:/home/userx/libs/aws-mysql-jdbc-1.1.2.jar
+wget https://github.com/awslabs/aws-mysql-jdbc/releases/download/1.1.3/aws-mysql-jdbc-1.1.3.jar
+cp aws-mysql-jdbc-1.1.3.jar /home/userx/libs/
+export CLASSPATH=$CLASSPATH:/home/userx/libs/aws-mysql-jdbc-1.1.3.jar
 ```
 
 After downloading the `.jar` file and updating the CLASSPATH, add the driver information to your `Project`:
@@ -117,9 +117,9 @@ After downloading the `.jar` file and updating the CLASSPATH, add the driver inf
 To upgrade to a newer version of the driver, download the updated driver, and add it to your CLASSPATH:  
 
 ```bash
-wget https://github.com/awslabs/aws-mysql-jdbc/releases/download/1.1.2/aws-mysql-jdbc-1.1.2.jar
-cp aws-mysql-jdbc-1.1.2.jar /home/userx/libs/
-export CLASSPATH=$CLASSPATH:/home/userx/libs/aws-mysql-jdbc-1.1.2.jar
+wget https://github.com/awslabs/aws-mysql-jdbc/releases/download/1.1.3/aws-mysql-jdbc-1.1.3.jar
+cp aws-mysql-jdbc-1.1.3.jar /home/userx/libs/
+export CLASSPATH=$CLASSPATH:/home/userx/libs/aws-mysql-jdbc-1.1.3.jar
 ```
 
 Then, follow the steps listed above to update your project to the latest version.
@@ -131,9 +131,9 @@ To use the driver with the DBeaver database client, download the `.jar` file, co
 **Example - DBeaver**
 
 ```bash
-wget https://github.com/awslabs/aws-mysql-jdbc/releases/download/1.1.2/aws-mysql-jdbc-1.1.2.jar
-cp aws-mysql-jdbc-1.1.2.jar /home/userx/libs/
-export CLASSPATH=$CLASSPATH:/home/userx/libs/aws-mysql-jdbc-1.1.2.jar
+wget https://github.com/awslabs/aws-mysql-jdbc/releases/download/1.1.3/aws-mysql-jdbc-1.1.3.jar
+cp aws-mysql-jdbc-1.1.3.jar /home/userx/libs/
+export CLASSPATH=$CLASSPATH:/home/userx/libs/aws-mysql-jdbc-1.1.3.jar
 ```
 
 After downloading the .jar file and adding it to your CLASSPATH, add the driver information to the DBeaver client:
@@ -169,9 +169,9 @@ After adding driver information, you can create new connections that use the AWS
 To upgrade to a newer version of the driver, download the updated driver, and add it to your CLASSPATH:  
 
 ```bash
-wget https://github.com/awslabs/aws-mysql-jdbc/releases/download/1.1.2/aws-mysql-jdbc-1.1.2.jar
-cp aws-mysql-jdbc-1.1.2.jar /home/userx/libs/
-export CLASSPATH=$CLASSPATH:/home/userx/libs/aws-mysql-jdbc-1.1.2.jar
+wget https://github.com/awslabs/aws-mysql-jdbc/releases/download/1.1.3/aws-mysql-jdbc-1.1.3.jar
+cp aws-mysql-jdbc-1.1.3.jar /home/userx/libs/
+export CLASSPATH=$CLASSPATH:/home/userx/libs/aws-mysql-jdbc-1.1.3.jar
 ```
 Then, follow the steps listed above to update your DBeaver client settings.
 
@@ -184,7 +184,7 @@ If there is an unreleased feature you would like to try, it may be available in
   <dependency>
     <groupId>software.aws.rds</groupId>
     <artifactId>aws-mysql-jdbc</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
     <scope>system</scope>
     <systemPath>path-to-snapshot-jar</systemPath>
   </dependency>

build.gradle.kts

@@ -38,7 +38,6 @@ val versionMajor = project.property("com.mysql.cj.build.driver.version.major")
 val versionMinor = project.property("com.mysql.cj.build.driver.version.minor")
 val versionSubminor = Integer.parseInt(project.property("com.mysql.cj.build.driver.version.subminor").toString()) + if (project.property("snapshot") == "true") 1 else 0
 version = "$versionMajor.$versionMinor.$versionSubminor" + if (project.property("snapshot") == "true") "-SNAPSHOT" else ""
-
 // Shared Shading Values
 val shadingOriginPackage: String = "com.mysql"
 val shadingDestinationPackage: String = "software.aws.rds.jdbc.mysql.shading.com.mysql"
@@ -313,9 +312,9 @@ tasks.register<Sync>("replaceTokens") {
     val git = org.ajoberstar.grgit.Grgit.open(mapOf("currentDir" to project.rootDir))
     val revision = git.head().id
 
-    val versionFull = "$this.version"
+    val versionFull = version
 
-    val fullProdName = "${project.property("com.mysql.cj.build.driver.name")}-$versionFull"
+    val fullProdName = "${project.property("com.mysql.cj.build.driver.name")}-${versionFull}"
 
     filter(ReplaceTokens::class, "tokens" to mapOf(
             "MYSQL_CJ_MAJOR_VERSION" to versionMajor,

gradle.properties

@@ -40,7 +40,7 @@ spotbugs.version=4.0.0
 # Build properties
 com.mysql.cj.build.driver.version.major=1
 com.mysql.cj.build.driver.version.minor=1
-com.mysql.cj.build.driver.version.subminor=2
+com.mysql.cj.build.driver.version.subminor=3
 com.mysql.cj.build.driver.displayName=Amazon Web Services (AWS) JDBC Driver for MySQL
 com.mysql.cj.build.driver.name=aws-mysql-connector-java
 com.mysql.cj.build.licenseType=GPLv2