Skip to content

Commit 1d7eb2c

Browse files
authored
update to Java 11 and Celesta 8 (#164)
* update to Java 11 and Celesta 8 * make checkstyle happy
1 parent 7e33dbd commit 1d7eb2c

File tree

3 files changed

+11
-14
lines changed

3 files changed

+11
-14
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v3
14-
15-
- name: Set up JDK 8
16-
uses: actions/setup-java@v3
14+
15+
- name: Set up JDK 11
16+
uses: actions/setup-java@v4
1717
with:
1818
distribution: 'temurin'
19-
java-version: '8'
19+
java-version: '11'
2020
cache: 'maven'
2121

2222
- name: Build and test

pom.xml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>ru.curs</groupId>
66
<artifactId>spring-boot-starter-celesta</artifactId>
7-
<version>2.1.68-SNAPSHOT</version>
7+
<version>3.0.0-SNAPSHOT</version>
88
<name>spring-boot-starter-celesta</name>
99
<description>Celesta integration with Spring Boot</description>
1010
<packaging>jar</packaging>
@@ -45,19 +45,19 @@
4545
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4646

4747
<!--dependency versions -->
48-
<celesta.version>7.4.39</celesta.version>
48+
<celesta.version>8.0.0</celesta.version>
4949
<checkstyle.version>8.42</checkstyle.version>
5050
<spring.boot.version>2.5.0</spring.boot.version>
5151

5252
<!--plugin versions -->
5353
<spotbugs.maven.plugin.version>4.7.3.5</spotbugs.maven.plugin.version>
5454
<maven.checkstyle.plugin.version>3.3.0</maven.checkstyle.plugin.version>
55-
<maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
55+
<maven.compiler.plugin.version>3.12.1</maven.compiler.plugin.version>
5656
<maven.jar.plugin.version>3.3.0</maven.jar.plugin.version>
5757
<maven.javadoc.plugin.version>3.5.0</maven.javadoc.plugin.version>
5858
<maven.site.plugin.version>3.12.1</maven.site.plugin.version>
59-
<maven.source.plugin.version>3.2.1</maven.source.plugin.version>
60-
<maven.surefire.plugin.version>3.1.2</maven.surefire.plugin.version>
59+
<maven.source.plugin.version>3.3.0</maven.source.plugin.version>
60+
<maven.surefire.plugin.version>3.2.5</maven.surefire.plugin.version>
6161
</properties>
6262

6363
<distributionManagement>
@@ -130,15 +130,14 @@
130130
<artifactId>maven-compiler-plugin</artifactId>
131131
<version>${maven.compiler.plugin.version}</version>
132132
<configuration>
133-
<source>1.8</source>
134-
<target>1.8</target>
133+
<release>11</release>
135134
<encoding>utf-8</encoding>
136135
</configuration>
137136
</plugin>
138137
<plugin>
139138
<groupId>org.jacoco</groupId>
140139
<artifactId>jacoco-maven-plugin</artifactId>
141-
<version>0.8.10</version>
140+
<version>0.8.11</version>
142141
<executions>
143142
<execution>
144143
<goals>

src/main/java/ru/curs/celesta/spring/boot/autoconfigure/CelestaAutoConfiguration.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import ru.curs.celesta.Celesta;
1818
import ru.curs.celesta.ConnectionPool;
1919
import ru.curs.celesta.ConnectionPoolConfiguration;
20-
import ru.curs.celesta.DBType;
2120
import ru.curs.celesta.DatasourceConnectionPool;
2221
import ru.curs.celesta.InternalConnectionPool;
2322
import ru.curs.celesta.transaction.CelestaTransactionAspect;
@@ -66,7 +65,6 @@ ConnectionPool connectionPool(CelestaProperties celestaProperties,
6665
cpc.setLogin(jdbc.getUsername());
6766
cpc.setPassword(jdbc.getPassword());
6867
}
69-
cpc.setDriverClassName(DBType.resolveByJdbcUrl(cpc.getJdbcConnectionUrl()).getDriverClassName());
7068
return InternalConnectionPool.create(cpc);
7169
} else {
7270
return new DatasourceConnectionPool(dataSource);

0 commit comments

Comments
 (0)