Skip to content

Commit 29f7fb1

Browse files
author
bwajtr
committed
Switched buildsystem to gradle and upgraded spring boot to newest version
1 parent 320fee8 commit 29f7fb1

5 files changed

Lines changed: 53 additions & 161 deletions

File tree

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
/target
21
/.idea
2+
/build

build.gradle

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
// this buildscript modification is required for applying spring-boot parent BOM
2+
buildscript {
3+
repositories {
4+
jcenter()
5+
}
6+
7+
dependencies {
8+
classpath("org.springframework.boot:spring-boot-gradle-plugin:1.4.1.RELEASE")
9+
}
10+
}
11+
12+
apply plugin: 'spring-boot'
13+
apply plugin: 'java'
14+
15+
group = 'com.clevergang'
16+
version = '1.0.0'
17+
description = 'Comparison and common patterns for non-JPA SQL mapping frameworks for Java (Jooq, Spring JDBCTemplate etc.)'
18+
19+
repositories {
20+
jcenter()
21+
}
22+
23+
// We need Java8 for this project
24+
tasks.withType(JavaCompile) {
25+
sourceCompatibility = '1.8'
26+
}
27+
28+
29+
dependencies {
30+
compile "org.springframework.boot:spring-boot-starter-jdbc"
31+
compile "org.springframework.boot:spring-boot-starter-jooq"
32+
compile "org.postgresql:postgresql:9.4.1211.jre7"
33+
compile "org.apache.commons:commons-lang3:3.4"
34+
compile "org.apache.commons:commons-collections4:4.1"
35+
36+
testCompile "org.springframework.boot:spring-boot-starter-test"
37+
}
38+
39+
// we want to show following test events in the log
40+
test {
41+
testLogging {
42+
events "PASSED", "FAILED", "SKIPPED"
43+
}
44+
}

pom.xml

Lines changed: 0 additions & 152 deletions
This file was deleted.

src/test/java/com/clevergang/dbtests/JdbcTemplateScenariosTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55
import org.junit.Test;
66
import org.junit.runner.RunWith;
77
import org.springframework.beans.factory.annotation.Autowired;
8-
import org.springframework.boot.test.SpringApplicationConfiguration;
8+
import org.springframework.boot.test.context.SpringBootTest;
99
import org.springframework.test.annotation.Rollback;
1010
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
1111
import org.springframework.transaction.annotation.Transactional;
1212

1313
@RunWith(SpringJUnit4ClassRunner.class)
14-
@SpringApplicationConfiguration(classes = DbTestsApplication.class)
14+
@SpringBootTest(classes = DbTestsApplication.class)
1515
@Transactional
1616
@Rollback
1717
public class JdbcTemplateScenariosTest {
1818

1919
@Autowired
2020
private JDBCDataRepositoryImpl jdbcRepository;
2121

22-
protected Scenarios scenarios;
22+
private Scenarios scenarios;
2323

2424
@Before
2525
public void setup() {

src/test/java/com/clevergang/dbtests/JooqScenariosTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55
import org.junit.Test;
66
import org.junit.runner.RunWith;
77
import org.springframework.beans.factory.annotation.Autowired;
8-
import org.springframework.boot.test.SpringApplicationConfiguration;
8+
import org.springframework.boot.test.context.SpringBootTest;
99
import org.springframework.test.annotation.Rollback;
10-
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
10+
import org.springframework.test.context.junit4.SpringRunner;
1111
import org.springframework.transaction.annotation.Transactional;
1212

13-
@RunWith(SpringJUnit4ClassRunner.class)
14-
@SpringApplicationConfiguration(classes = DbTestsApplication.class)
13+
@RunWith(SpringRunner.class)
14+
@SpringBootTest(classes = DbTestsApplication.class)
1515
@Transactional
1616
@Rollback
1717
public class JooqScenariosTest {
1818

1919
@Autowired
2020
private JooqDataRepositoryImpl jooqRepository;
2121

22-
protected Scenarios scenarios;
22+
private Scenarios scenarios;
2323

2424
@Before
2525
public void setup() {

0 commit comments

Comments
 (0)