fix: move Spring Wildfly example gradle.properties file to correct lo…

…cation (#492)
aws · Jun 16, 2023 · bc9fa48 · bc9fa48
1 parent 0f8b5aa
commit bc9fa48
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,8 +3,12 @@ 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).
 
-## [2.2.0] - 2023-6-14
+## [2.2.1] - 2023-6-16
+
+### :bug: Fixed
+- Move the Spring Wildfly example `gradle.properties` file to `examples/SpringWildflyExample/spring` ([Issue #491](https://github.com/awslabs/aws-advanced-jdbc-wrapper/issues/491)).
 
+## [2.2.0] - 2023-6-14
 ### :magic_wand: Added
 - Autoscaling and the least connections strategy ([PR #451](https://github.com/awslabs/aws-advanced-jdbc-wrapper/pull/451)).
 - [Target driver dialects](https://github.com/awslabs/aws-advanced-jdbc-wrapper/blob/main/docs/using-the-jdbc-driver/using-the-jdbc-driver/TargetDriverDialects.md) ([PR #452](https://github.com/awslabs/aws-advanced-jdbc-wrapper/pull/452)).
@@ -14,14 +18,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
   - Internal connection pool behaviour only verifying password on initial connection. See [Using the Read Write Splitting Plugin Internal Connection Pooling document](https://github.com/awslabs/aws-advanced-jdbc-wrapper/blob/main/docs/using-the-jdbc-driver/using-plugins/UsingTheReadWriteSplittingPlugin.md#internal-connection-pooling) and [code example](https://github.com/awslabs/aws-advanced-jdbc-wrapper/blob/main/examples/AWSDriverExample/src/main/java/software/amazon/InternalConnectionPoolPasswordWarning.java).
   - Link performance test in table of contents. See [Documentation Table of Contents](https://github.com/awslabs/aws-advanced-jdbc-wrapper/blob/main/docs/Documentation.md).
   - Cluster URLs are not internally pooled. See [Using Read Write Splitting Plugin Internal Connection Pooling](https://github.com/awslabs/aws-advanced-jdbc-wrapper/blob/main/docs/using-the-jdbc-driver/using-plugins/UsingTheReadWriteSplittingPlugin.md#internal-connection-pooling).
-  - The `leastConnections` strategy in the [Using Read Write Splitting Plugin Internal Connection Pooling](https://github.com/awslabs/aws-advanced-jdbc-wrapper/blob/main/docs/using-the-jdbc-driver/using-plugins/UsingTheReadWriteSplittingPlugin.md#internal-connection-pooling) at point #3.
+  - The `leastConnections` strategy in the [Using Read Write Splitting Plugin Internal Connection Pooling](https://github.com/awslabs/aws-advanced-jdbc-wrapper/blob/main/docs/using-the-jdbc-driver/using-plugins/UsingTheReadWriteSplittingPlugin.md#internal-connection-pooling) at point 3.
 - Sample code and tutorial for using the driver with:
   - [Spring and Hibernate](./examples/SpringHibernateExample/README.md)
   - [Spring and Wildfly](./examples/SpringWildflyExample/README.md)
   - [Spring and Hikari](./examples/SpringBootHikariExample/README.md)
 
 ### :bug: Fixed
-- Pruned null connections in connection tracker plugins ([PR #461](https://github.com/awslabs/aws-advanced-jdbc-wrapper/pull/461))
+- Pruned null connections in connection tracker plugins ([PR #461](https://github.com/awslabs/aws-advanced-jdbc-wrapper/pull/461)).
 - HikariCP integration tests and reworked AwsWrapperDataSource by removing property names, introduced a set of simple properties to set database, server name and server port ([PR #468](https://github.com/awslabs/aws-advanced-jdbc-wrapper/pull/468)).
 - Checkstyle failure due to modified license and driver connection provider passing original properties resulting properties being overridden for subsequent connections ([PR #471](https://github.com/awslabs/aws-advanced-jdbc-wrapper/pull/471)).
 - IamAuthConnectionPlugin to properly prioritize the override property IAM_DEFAULT_PORT then Hosts port, and then Dialect port ([Issue #473](https://github.com/awslabs/aws-advanced-jdbc-wrapper/issues/473)).
@@ -132,6 +136,7 @@ The Amazon Web Services (AWS) Advanced JDBC Driver allows an application to take
 * The [AWS IAM Authentication Connection Plugin](./docs/using-the-jdbc-driver/using-plugins/UsingTheIamAuthenticationPlugin.md)
 * The [AWS Secrets Manager Connection Plugin](./docs/using-the-jdbc-driver/using-plugins/UsingTheAwsSecretsManagerPlugin.md)
 
+[2.2.1]: https://github.com/awslabs/aws-advanced-jdbc-wrapper/compare/2.2.0...2.2.1
 [2.2.0]: https://github.com/awslabs/aws-advanced-jdbc-wrapper/compare/2.1.2...2.2.0
 [2.1.2]: https://github.com/awslabs/aws-advanced-jdbc-wrapper/compare/2.1.1...2.1.2
 [2.1.1]: https://github.com/awslabs/aws-advanced-jdbc-wrapper/compare/2.1.0...2.1.1

diff --git a/benchmarks/README.md b/benchmarks/README.md
@@ -7,5 +7,5 @@ The benchmarks do not measure the performance of target JDBC drivers nor the per
 ## Usage
 1. Build the benchmarks with the following command `../gradlew jmhJar`.
     1. the JAR file will be outputted to `build/libs`
-2. Run the benchmarks with the following command `java -jar build/libs/benchmarks-2.2.0-jmh.jar`.
+2. Run the benchmarks with the following command `java -jar build/libs/benchmarks-2.2.1-jmh.jar`.
     1. you may have to update the command based on the exact version of the produced JAR file
diff --git a/docs/GettingStarted.md b/docs/GettingStarted.md
@@ -12,7 +12,7 @@ If you are using the AWS JDBC Driver as part of a Gradle project, include the wr
 
 ```gradle
 dependencies {
-    implementation group: 'software.amazon.jdbc', name: 'aws-advanced-jdbc-wrapper', version: '2.2.0'
+    implementation group: 'software.amazon.jdbc', name: 'aws-advanced-jdbc-wrapper', version: '2.2.1'
     implementation group: 'org.postgresql', name: 'postgresql', version: '42.5.0'
 }
 ```
@@ -26,13 +26,13 @@ You can use pre-compiled packages that can be downloaded directly from [GitHub R
 For example, the following command uses wget to download the wrapper:
 
 ```bash
-wget https://github.com/awslabs/aws-advanced-jdbc-wrapper/releases/download/2.2.0/aws-advanced-jdbc-wrapper-2.2.0.jar
+wget https://github.com/awslabs/aws-advanced-jdbc-wrapper/releases/download/2.2.1/aws-advanced-jdbc-wrapper-2.2.1.jar
 ```
 
 Then, the following command adds the AWS JDBC Driver to the CLASSPATH:
 
 ```bash
-export CLASSPATH=$CLASSPATH:/home/userx/libs/aws-advanced-jdbc-wrapper-2.2.0.jar
+export CLASSPATH=$CLASSPATH:/home/userx/libs/aws-advanced-jdbc-wrapper-2.2.1.jar
 ```
 
 ### As a Maven Dependency
@@ -44,7 +44,7 @@ You can use [Maven's dependency management](https://search.maven.org/search?q=g:
     <dependency>
         <groupId>software.amazon.jdbc</groupId>
         <artifactId>aws-advanced-jdbc-wrapper</artifactId>
-        <version>2.2.0</version>
+        <version>2.2.1</version>
     </dependency>
 </dependencies>
 ```
@@ -55,15 +55,15 @@ You can use [Gradle's dependency management](https://search.maven.org/search?q=g
 
 ```gradle
 dependencies {
-    implementation group: 'software.amazon.jdbc', name: 'aws-advanced-jdbc-wrapper', version: '2.2.0'
+    implementation group: 'software.amazon.jdbc', name: 'aws-advanced-jdbc-wrapper', version: '2.2.1'
 }
 ```
 
 To add a Gradle dependency in a Kotlin syntax, use the following configuration:
 
 ```kotlin
 dependencies {
-    implementation("software.amazon.jdbc:aws-advanced-jdbc-wrapper:2.2.0")
+    implementation("software.amazon.jdbc:aws-advanced-jdbc-wrapper:2.2.1")
 }
 ```
 

diff --git a/docs/using-the-jdbc-driver/UsingTheJdbcDriver.md b/docs/using-the-jdbc-driver/UsingTheJdbcDriver.md
@@ -134,7 +134,7 @@ If there is an unreleased feature you would like to try, it may be available in
   <dependency>
     <groupId>software.amazon.jdbc</groupId>
     <artifactId>aws-advanced-jdbc-wrapper</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>2.2.1-SNAPSHOT</version>
     <scope>system</scope>
     <systemPath>path-to-snapshot-jar</systemPath>
   </dependency>

diff --git a/examples/SpringBootHikariExample/README.md b/examples/SpringBootHikariExample/README.md
@@ -4,7 +4,7 @@ In this tutorial, you will set up a Spring Boot application using Hikari and the
 
 > Note: this tutorial was written using the following technologies:
 >    - Spring Boot 2.7.0
->    - AWS Advanced JDBC Wrapper 2.2.0
+>    - AWS Advanced JDBC Wrapper 2.2.1
 >    - Postgresql 42.5.4
 >    - Java 8
 

diff --git a/examples/SpringHibernateExample/README.md b/examples/SpringHibernateExample/README.md
@@ -5,7 +5,7 @@ In this tutorial, you will set up a Spring Boot and Hibernate application with t
 > Note: this tutorial was written using the following technologies:
 >    - Spring Boot 2.7.1
 >    - Hibernate
->    - AWS Advanced JDBC Driver 2.2.0
+>    - AWS Advanced JDBC Driver 2.2.1
 >    - Postgresql 42.5.4
 >    - Gradle 7
 >    - Java 11

diff --git a/examples/SpringWildflyExample/README.md b/examples/SpringWildflyExample/README.md
@@ -5,7 +5,7 @@ In this tutorial, you will set up a Wildfly and Spring Boot application with the
 > Note: this tutorial was written using the following technologies:
 >    - Spring Boot 2.7.1
 >    - Wildfly 26.1.1 Final
->    - AWS Advanced JDBC Wrapper 2.2.0
+>    - AWS Advanced JDBC Wrapper 2.2.1
 >    - Postgresql 42.5.4
 >    - Gradle 7
 >    - Java 11
@@ -38,7 +38,7 @@ Create a Gradle project with the following project hierarchy:
               │       └───main
               │       │   │───module.xml
               │       │   │───postgresql-42.5.4.jar
-              │       │   └───aws-advanced-jdbc-wrapper-2.2.0.jar
+              │       │   └───aws-advanced-jdbc-wrapper-2.2.1.jar
       └───standalone
           ├───configuration
               ├───amazon
@@ -133,7 +133,7 @@ Since this example uses the PostgreSQL JDBC driver as the target driver, you nee
 <module xmlns="urn:jboss:module:1.1" name="software.amazon.jdbc">
 
   <resources>
-    <resource-root path="aws-advanced-jdbc-wrapper-2.2.0.jar"/>
+    <resource-root path="aws-advanced-jdbc-wrapper-2.2.1.jar"/>
     <resource-root path="postgresql-42.5.4.jar"/>
   </resources>
 </module>

diff --git a/...es/SpringWildflyExample/gradle.properties → ...ngWildflyExample/spring/gradle.properties b/...es/SpringWildflyExample/gradle.properties → ...ngWildflyExample/spring/gradle.properties
diff --git a/examples/SpringWildflyExample/wildfly/modules/software/amazon/jdbc/main/module.xml b/examples/SpringWildflyExample/wildfly/modules/software/amazon/jdbc/main/module.xml
@@ -19,7 +19,7 @@
 <module xmlns="urn:jboss:module:1.1" name="software.amazon.jdbc">
 
   <resources>
-    <resource-root path="aws-advanced-jdbc-wrapper-2.2.0.jar"/>
+    <resource-root path="aws-advanced-jdbc-wrapper-2.2.1.jar"/>
     <resource-root path="postgresql-42.5.4.jar"/>
   </resources>
 </module>
diff --git a/gradle.properties b/gradle.properties
@@ -14,5 +14,5 @@
 
 aws-advanced-jdbc-wrapper.version.major=2
 aws-advanced-jdbc-wrapper.version.minor=2
-aws-advanced-jdbc-wrapper.version.subminor=0
+aws-advanced-jdbc-wrapper.version.subminor=1
 snapshot=false
diff --git a/wrapper/src/test/resources/hibernate_files/hibernate-core.gradle b/wrapper/src/test/resources/hibernate_files/hibernate-core.gradle
@@ -61,7 +61,7 @@ dependencies {
         transitive = true
     }
     testImplementation "joda-time:joda-time:2.3"
-    testImplementation files('/app/libs/aws-advanced-jdbc-wrapper-2.2.0.jar')
+    testImplementation files('/app/libs/aws-advanced-jdbc-wrapper-2.2.1.jar')
     testImplementation dbLibs.postgresql
     testImplementation dbLibs.mysql
     testImplementation dbLibs.h2

diff --git a/wrapper/src/test/resources/hibernate_files/java-module.gradle b/wrapper/src/test/resources/hibernate_files/java-module.gradle
@@ -97,7 +97,7 @@ dependencies {
     // Since both the DB2 driver and HANA have a package "net.jpountz" we have to add dependencies conditionally
     // This is due to the "no split-packages" requirement of Java 9+
 
-    testRuntimeOnly files('/app/libs/aws-advanced-jdbc-wrapper-2.2.0.jar')
+    testRuntimeOnly files('/app/libs/aws-advanced-jdbc-wrapper-2.2.1.jar')
     testRuntimeOnly dbLibs.mysql
 
     if ( db.startsWith( 'db2' ) ) {