Skip to content

Commit d8895f1

Browse files
mgraminmgramin
committed
1 parent ec4b9e0 commit d8895f1

3 files changed

Lines changed: 38 additions & 74 deletions

File tree

‎pom.xml‎

Lines changed: 37 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@
3434
<packaging>jar</packaging>
3535

3636
<name>sql-boot</name>
37-
<description>Evolutionary, Transparent and Polyglot DB-tool for Developers,
38-
DBA and DevOps Engineers
39-
</description>
37+
<description>Evolutionary, Transparent and Polyglot DB-tool for Developers, DBA and DevOps Engineers</description>
4038

4139
<licenses>
4240
<license>
@@ -63,28 +61,27 @@
6361
</developer>
6462
</developers>
6563

66-
<parent>
67-
<groupId>org.springframework.boot</groupId>
68-
<artifactId>spring-boot-starter-parent</artifactId>
69-
<version>2.1.1.RELEASE</version>
70-
<relativePath/>
71-
</parent>
72-
7364
<properties>
74-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
75-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
76-
<java.version>1.8</java.version>
77-
<dbh2.version>1.4.187</dbh2.version>
65+
<!--<project.bujava.versionild.sourceEncoding>UTF-8</project.bujava.versionild.sourceEncoding>-->
66+
<!--<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>-->
67+
<!--<dbh2.version>1.4.187</dbh2.version>-->
7868
<docker.image.prefix>mgramin</docker.image.prefix>
7969

8070
<github.global.server>github</github.global.server>
8171
<github.maven-plugin>0.12</github.maven-plugin>
8272

8373
<antlr4.visitor>true</antlr4.visitor>
8474
<antlr4.listener>true</antlr4.listener>
85-
<kotlin.version>1.3.20</kotlin.version>
75+
<kotlin.version>1.3.21</kotlin.version>
8676
</properties>
8777

78+
<parent>
79+
<groupId>org.springframework.boot</groupId>
80+
<artifactId>spring-boot-starter-parent</artifactId>
81+
<version>2.2.0.M1</version>
82+
<relativePath/>
83+
</parent>
84+
8885

8986
<dependencies>
9087

@@ -94,10 +91,32 @@
9491
<version>${kotlin.version}</version>
9592
</dependency>
9693

94+
95+
<dependency>
96+
<groupId>org.springframework.boot</groupId>
97+
<artifactId>spring-boot-starter</artifactId>
98+
</dependency>
99+
100+
<dependency>
101+
<groupId>org.springframework.boot</groupId>
102+
<artifactId>spring-boot-starter-test</artifactId>
103+
<scope>test</scope>
104+
<exclusions>
105+
<exclusion>
106+
<groupId>junit</groupId>
107+
<artifactId>junit</artifactId>
108+
</exclusion>
109+
</exclusions>
110+
</dependency>
111+
112+
<dependency>
113+
<groupId>org.springframework.boot</groupId>
114+
<artifactId>spring-boot-starter-web</artifactId>
115+
</dependency>
116+
97117
<dependency>
98-
<groupId>org.jetbrains.kotlinx</groupId>
99-
<artifactId>kotlinx-coroutines-core</artifactId>
100-
<version>1.1.1</version>
118+
<groupId>org.springframework.boot</groupId>
119+
<artifactId>spring-boot-starter-jdbc</artifactId>
101120
</dependency>
102121

103122

@@ -112,7 +131,6 @@
112131
</dependency>
113132

114133

115-
116134
<dependency>
117135
<groupId>org.jetbrains.kotlin</groupId>
118136
<artifactId>kotlin-test-junit</artifactId>
@@ -123,21 +141,18 @@
123141
<dependency>
124142
<groupId>org.junit.jupiter</groupId>
125143
<artifactId>junit-jupiter-engine</artifactId>
126-
<version>5.3.2</version>
127144
<scope>test</scope>
128145
</dependency>
129146

130147
<dependency>
131148
<groupId>org.junit.jupiter</groupId>
132149
<artifactId>junit-jupiter-params</artifactId>
133-
<version>5.3.2</version>
134150
<scope>test</scope>
135151
</dependency>
136152

137153
<dependency>
138154
<groupId>org.junit.vintage</groupId>
139155
<artifactId>junit-vintage-engine</artifactId>
140-
<version>5.3.2</version>
141156
<scope>test</scope>
142157
</dependency>
143158

@@ -155,37 +170,6 @@
155170
</dependency>
156171

157172

158-
<dependency>
159-
<groupId>org.springframework.boot</groupId>
160-
<artifactId>spring-boot-starter</artifactId>
161-
</dependency>
162-
163-
<dependency>
164-
<groupId>org.springframework.boot</groupId>
165-
<artifactId>spring-boot-starter-test</artifactId>
166-
<scope>test</scope>
167-
<!-- Exclude JUnit 4 from starter-test (and all other related test-starter, i.e
168-
those for security and project reactor -->
169-
<exclusions>
170-
<exclusion>
171-
<groupId>junit</groupId>
172-
<artifactId>junit</artifactId>
173-
</exclusion>
174-
</exclusions>
175-
</dependency>
176-
177-
<dependency>
178-
<groupId>org.springframework.boot</groupId>
179-
<artifactId>spring-boot-starter-web</artifactId>
180-
</dependency>
181-
182-
<dependency>
183-
<groupId>org.springframework.boot</groupId>
184-
<artifactId>spring-boot-starter-jdbc</artifactId>
185-
</dependency>
186-
187-
188-
189173
<dependency>
190174
<groupId>org.codehaus.groovy</groupId>
191175
<artifactId>groovy-templates</artifactId>
@@ -227,13 +211,11 @@
227211
<dependency>
228212
<groupId>javax.cache</groupId>
229213
<artifactId>cache-api</artifactId>
230-
<version>1.0.0</version>
231214
</dependency>
232215

233216
<dependency>
234217
<groupId>com.hazelcast</groupId>
235218
<artifactId>hazelcast</artifactId>
236-
<version>3.9-EA</version>
237219
</dependency>
238220

239221
<dependency>
@@ -242,12 +224,6 @@
242224
<version>20171018</version>
243225
</dependency>
244226

245-
<dependency>
246-
<groupId>net.steppschuh.markdowngenerator</groupId>
247-
<artifactId>markdowngenerator</artifactId>
248-
<version>1.3.1.1</version>
249-
</dependency>
250-
251227
</dependencies>
252228

253229
<build>

‎src/main/kotlin/com/github/mgramin/sqlboot/model/connection/SimpleDbConnection.kt‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,18 +66,6 @@ open class SimpleDbConnection : DbConnection {
6666
override fun getHealth() = "UKNOWN"
6767

6868
constructor()
69-
constructor(name: String? = null, baseFolder: Resource? = null, url: String? = null,
70-
user: String? = null, password: String? = null, driverClassName: String? = null,
71-
properties: String? = null, paginationQueryTemplate: String? = null) {
72-
this.name = name
73-
this.baseFolder = baseFolder
74-
this.url = url
75-
this.user = user
76-
this.password = password
77-
this.driverClassName = driverClassName
78-
this.properties = properties
79-
this.paginationQueryTemplate = paginationQueryTemplate
80-
}
8169

8270
override fun getProperties(): Map<String, Any> {
8371
return JSONObject(properties).toMap()

‎src/test/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/sql/SqlResourceTypeTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class SqlResourceTypeTest {
8989
aliases = arrayListOf("column"),
9090
sql = sql,
9191
connections = listOf(db))
92-
assertEquals(347, type.read(DbUri("column/main_schema.users")).count().block())
92+
assertEquals(356, type.read(DbUri("column/main_schema.users")).count().block())
9393
}
9494

9595
@Test

0 commit comments

Comments
 (0)