Skip to content

Commit 6f179fe

Browse files
author
Roman Skidan
committed
upd
1 parent 3679e04 commit 6f179fe

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

.github/workflows/maven-ci-build.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@ jobs:
1818

1919
- name: Preparing build
2020
run: |
21-
wget https://dev.mysql.com/get/Downloads/MySQL-Cluster-7.6/mysql-cluster-community-java_7.6.9-1ubuntu16.04_amd64.deb
22-
sudo dpkg -i mysql-cluster-community-java_7.6.9-1ubuntu16.04_amd64.deb
23-
mvn install:install-file -DgroupId=com.mysql.ndb -DartifactId=clusterj -Dversion=7.6.9 -Dpackaging=jar -Dfile=/usr/share/mysql/java/clusterj-7.6.9.jar -DgeneratePom=true
24-
wget https://dev.mysql.com/get/Downloads/MySQL-Cluster-7.6/ndbclient_7.6.9-1ubuntu16.04_amd64.deb
25-
sudo dpkg -i ndbclient_7.6.9-1ubuntu16.04_amd64.deb
21+
wget https://dev.mysql.com/get/Downloads/MySQL-Cluster-8.0/mysql-cluster-community-java_8.0.23-1ubuntu20.10_amd64.deb
22+
sudo dpkg -i mysql-cluster-community-java_8.0.23-1ubuntu20.10_amd64.deb
23+
mvn install:install-file -DgroupId=com.mysql.ndb -DartifactId=clusterj -Dversion=8.0.23 -Dpackaging=jar -Dfile=/usr/share/mysql-8.0/java/clusterj-8.0.23.jar -DgeneratePom=true
24+
wget https://dev.mysql.com/get/Downloads/MySQL-Cluster-8.0/ndbclient_8.0.23-1ubuntu20.10_amd64.deb
25+
sudo dpkg -i ndbclient_8.0.23-1ubuntu20.10_amd64.deb
26+
wget https://dev.mysql.com/get/Downloads/MySQL-Cluster-8.0/ndbclient-dev_8.0.23-1ubuntu20.10_amd64.deb
27+
sudo dpkg -i ndbclient-dev_8.0.23-1ubuntu20.10_amd64.deb
2628
sudo ln -s /usr/lib/x86_64-linux-gnu/libndbclient.so.6.1.0 /usr/lib/x86_64-linux-gnu/libndbclient.so
2729
2830
- name: Build with Maven

clusterj-app/src/test/java/ru/example/clusterj/junit5/MySQLClusterTcExtension.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ class MySQLClusterTcExtension implements Extension {
2020

2121
private static final String CLUSTERJ_DATABASE = "NDB_DB";
2222

23+
private static final String IMAGE_NAME = "mysql/mysql-cluster:8.0.23";
24+
2325
private static Network.Ipam getIpam() {
2426
Network.Ipam ipam = new Network.Ipam();
2527
ipam.withDriver("default");
@@ -33,7 +35,7 @@ private static Network.Ipam getIpam() {
3335
.createNetworkCmdModifier(createNetworkCmd -> createNetworkCmd.withIpam(getIpam()))
3436
.build();
3537

36-
private static GenericContainer ndbMgmd = new GenericContainer<>("mysql/mysql-cluster:7.6.16")
38+
private static GenericContainer ndbMgmd = new GenericContainer<>(IMAGE_NAME)
3739
.withNetwork(network)
3840
.withClasspathResourceMapping("mysql-cluster.cnf",
3941
"/etc/mysql-cluster.cnf",
@@ -46,7 +48,7 @@ private static Network.Ipam getIpam() {
4648
.withExposedPorts(1186)
4749
.waitingFor(Wait.forListeningPort().withStartupTimeout(Duration.ofSeconds(150)));
4850

49-
private static GenericContainer ndbd1 = new GenericContainer<>("mysql/mysql-cluster")
51+
private static GenericContainer ndbd1 = new GenericContainer<>(IMAGE_NAME)
5052
.withNetwork(network)
5153
.withClasspathResourceMapping("mysql-cluster.cnf",
5254
"/etc/mysql-cluster.cnf",
@@ -57,7 +59,7 @@ private static Network.Ipam getIpam() {
5759
.withCreateContainerCmdModifier(createContainerCmd -> createContainerCmd.withIpv4Address("192.168.0.3"))
5860
.withCommand("ndbd");
5961

60-
private static GenericContainer ndbMysqld = new GenericContainer<>("mysql/mysql-cluster")
62+
private static GenericContainer ndbMysqld = new GenericContainer<>(IMAGE_NAME)
6163
.withNetwork(network)
6264
.withCommand("mysqld")
6365
.withCreateContainerCmdModifier(createContainerCmd -> createContainerCmd.withIpv4Address("192.168.0.10"))

clusterj-spring-boot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<dependency>
1616
<groupId>com.mysql.ndb</groupId>
1717
<artifactId>clusterj</artifactId>
18-
<version>7.6.9</version>
18+
<version>8.0.23</version>
1919
</dependency>
2020
<dependency>
2121
<groupId>org.springframework.boot</groupId>

0 commit comments

Comments
 (0)