Skip to content

Commit badca9f

Browse files
authored
Merge pull request apache#154 from Croway/remove-agroal
Remove agroal version
2 parents 5a6ee51 + 53d1c33 commit badca9f

File tree

4 files changed

+4
-11
lines changed

4 files changed

+4
-11
lines changed

spring-boot-jta-jpa-autoconfigure/pom.xml

-3
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3737
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
3838
<category>Advanced</category>
39-
<agroal.version>2.2</agroal.version>
40-
<artemis.version>2.28.0</artemis.version>
4139
</properties>
4240

4341
<dependencyManagement>
@@ -132,7 +130,6 @@
132130
<dependency>
133131
<groupId>io.agroal</groupId>
134132
<artifactId>agroal-spring-boot-starter</artifactId>
135-
<version>${agroal.version}</version>
136133
</dependency>
137134
</dependencies>
138135

spring-boot-jta-jpa-autoconfigure/readme.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ docker run --name db-mysql \
2121
----
2222
docker exec -it db-mysql mysql -uroot -proot -e \
2323
"CREATE DATABASE testdb CHARACTER SET utf8mb4;
24-
CREATE USER 'admin'@'%' IDENTIFIED WITH mysql_native_password BY 'admin';
24+
CREATE USER 'admin'@'%' IDENTIFIED BY 'admin';
2525
GRANT CREATE,SELECT,INSERT,UPDATE,DELETE ON testdb.* TO 'admin'@'%';
2626
GRANT XA_RECOVER_ADMIN on *.* to 'admin'@'%';
2727
FLUSH PRIVILEGES;"
@@ -128,7 +128,7 @@ When the pod is ready, create the necessary schema and user:
128128
----
129129
oc exec deployment/mysql -- mysql -uroot -e \
130130
"CREATE DATABASE testdb CHARACTER SET utf8mb4;
131-
CREATE USER 'admin'@'%' IDENTIFIED WITH mysql_native_password BY 'admin';
131+
CREATE USER 'admin'@'%' IDENTIFIED BY 'admin';
132132
GRANT CREATE,SELECT,INSERT,UPDATE,DELETE ON testdb.* TO 'admin'@'%';
133133
GRANT XA_RECOVER_ADMIN on *.* to 'admin'@'%';
134134
FLUSH PRIVILEGES;"

spring-boot-jta-jpa-xml/pom.xml

-4
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@
3636
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3737
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
3838
<category>Advanced</category>
39-
<!-- Use 2.1 version due to https://issues.redhat.com/browse/AG-210 -->
40-
<agroal.version>2.1</agroal.version>
41-
<artemis.version>2.28.0</artemis.version>
4239
</properties>
4340

4441
<dependencyManagement>
@@ -130,7 +127,6 @@
130127
<dependency>
131128
<groupId>io.agroal</groupId>
132129
<artifactId>agroal-spring-boot-starter</artifactId>
133-
<version>${agroal.version}</version>
134130
</dependency>
135131
</dependencies>
136132

spring-boot-jta-jpa-xml/readme.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ docker run --name db-mysql \
2424
----
2525
docker exec -it db-mysql mysql -uroot -proot -e \
2626
"CREATE DATABASE testdb CHARACTER SET utf8mb4;
27-
CREATE USER 'admin'@'%' IDENTIFIED WITH mysql_native_password BY 'admin';
27+
CREATE USER 'admin'@'%' IDENTIFIED BY 'admin';
2828
GRANT CREATE,SELECT,INSERT,UPDATE,DELETE ON testdb.* TO 'admin'@'%';
2929
GRANT XA_RECOVER_ADMIN on *.* to 'admin'@'%';
3030
FLUSH PRIVILEGES;"
@@ -98,7 +98,7 @@ When the pod is ready, create the necessary schema and user:
9898
----
9999
oc exec deployment/mysql -- mysql -uroot -e \
100100
"CREATE DATABASE testdb CHARACTER SET utf8mb4;
101-
CREATE USER 'admin'@'%' IDENTIFIED WITH mysql_native_password BY 'admin';
101+
CREATE USER 'admin'@'%' IDENTIFIED BY 'admin';
102102
GRANT CREATE,SELECT,INSERT,UPDATE,DELETE ON testdb.* TO 'admin'@'%';
103103
GRANT XA_RECOVER_ADMIN on *.* to 'admin'@'%';
104104
FLUSH PRIVILEGES;"

0 commit comments

Comments
 (0)