Skip to content

Commit 71a287f

Browse files
akirasosaakirasosa
committed
spring boot 1.4.1
1 parent e81d606 commit 71a287f

File tree

10 files changed

+30
-72
lines changed

10 files changed

+30
-72
lines changed

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.springframework.boot</groupId>
1414
<artifactId>spring-boot-starter-parent</artifactId>
15-
<version>1.4.0.RELEASE</version>
15+
<version>1.4.1.RELEASE</version>
1616
<relativePath/>
1717
</parent>
1818

‎src/main/java/com/myapp/Application.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
package com.myapp;
22

3+
import org.slf4j.Logger;
4+
import org.slf4j.LoggerFactory;
35
import org.springframework.boot.SpringApplication;
46
import org.springframework.boot.autoconfigure.SpringBootApplication;
5-
import org.springframework.boot.builder.SpringApplicationBuilder;
67
import org.springframework.boot.context.web.SpringBootServletInitializer;
78

89
@SpringBootApplication
910
public class Application extends SpringBootServletInitializer {
1011

12+
@SuppressWarnings("unused")
13+
private static final Logger logger = LoggerFactory.getLogger(Application.class);
14+
1115
public static void main(String[] args) {
1216
SpringApplication.run(Application.class, args);
1317
}

‎src/main/java/com/myapp/config/DatasourceConfig.java

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

‎src/main/java/com/myapp/config/PooledDatasourceConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import java.sql.SQLException;
1313

1414
@Configuration
15-
@Profile({"stg", "prod"})
15+
@Profile({"dev2", "stg", "prod"})
1616
@ConfigurationProperties(prefix = "spring.datasource")
1717
public class PooledDatasourceConfig extends HikariConfig {
1818

‎src/main/resources/application.yml

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ app:
2020
spring:
2121
profiles: dev
2222
datasource:
23-
driverClassName: org.h2.Driver
24-
url: jdbc:h2:./db/dev;MODE=MySQL;DB_CLOSE_ON_EXIT=FALSE
23+
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
24+
url: jdbc:log4jdbc:h2:./db/dev;MODE=MySQL;DB_CLOSE_ON_EXIT=FALSE
2525
username: sa
2626
password:
2727
jpa:
@@ -30,24 +30,34 @@ spring:
3030
ddl-auto: update
3131
thymeleaf:
3232
cache: false
33-
logging:
34-
config: classpath:logback-dev.xml
3533
flyway:
3634
enabled: false
3735
---
36+
spring:
37+
profiles: dev2
38+
datasource:
39+
driverClassName: com.mysql.jdbc.Driver
40+
jdbcUrl: jdbc:mysql://localhost:3306/springboot-angular2-tutorial?useSSL=false
41+
username: root
42+
password:
43+
jpa:
44+
database: MYSQL
45+
hibernate:
46+
ddl-auto: validate
47+
logging:
48+
config: classpath:logback-prod.xml
49+
---
3850
spring:
3951
profiles: test
4052
datasource:
41-
driverClassName: org.h2.Driver
42-
url: jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_ON_EXIT=FALSE
53+
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
54+
url: jdbc:log4jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_ON_EXIT=FALSE
4355
username: sa
4456
password:
4557
jpa:
4658
database: H2
4759
hibernate:
4860
ddl-auto: create
49-
logging:
50-
config: classpath:logback-test.xml
5161
flyway:
5262
enabled: false
5363
server:
@@ -65,7 +75,7 @@ spring:
6575
hibernate:
6676
ddl-auto: validate
6777
logging:
68-
config: classpath:logback-stg.xml
78+
config: classpath:logback-prod.xml
6979
app:
7080
asset-host: cdn.hana053.com
7181
asset-manifest-url: https://s3.amazonaws.com/cdn.hana053.com/manifest.json

‎src/main/resources/logback-stg.xml

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

‎src/main/resources/logback-test.xml

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

‎src/main/resources/logback-dev.xml renamed to ‎src/main/resources/logback.xml

File renamed without changes.

‎src/test/groovy/com/myapp/controller/BaseControllerTest.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.myapp.controller
22

3-
import com.myapp.config.DatasourceConfig
3+
44
import com.myapp.config.QueryDSLConfig
55
import com.myapp.repository.RepositoryTestConfig
66
import org.slf4j.Logger
@@ -19,7 +19,7 @@ import spock.lang.Specification
1919
@WebAppConfiguration
2020
@Transactional
2121
@ActiveProfiles("test")
22-
@ContextConfiguration(classes = [RepositoryTestConfig, DatasourceConfig, QueryDSLConfig])
22+
@ContextConfiguration(classes = [RepositoryTestConfig, QueryDSLConfig])
2323
abstract class BaseControllerTest extends Specification {
2424

2525
@SuppressWarnings("GroovyUnusedDeclaration")

‎src/test/groovy/com/myapp/repository/BaseRepositoryTest.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.myapp.repository
22

3-
import com.myapp.config.DatasourceConfig
3+
44
import com.myapp.config.QueryDSLConfig
55
import org.springframework.test.context.ActiveProfiles
66
import org.springframework.test.context.ContextConfiguration
@@ -9,6 +9,6 @@ import spock.lang.Specification
99

1010
@Transactional
1111
@ActiveProfiles("test")
12-
@ContextConfiguration(classes = [RepositoryTestConfig, DatasourceConfig, QueryDSLConfig])
12+
@ContextConfiguration(classes = [RepositoryTestConfig, QueryDSLConfig])
1313
abstract class BaseRepositoryTest extends Specification {
1414
}

0 commit comments

Comments
 (0)