Skip to content

Commit 74f8bb5

Browse files
ci: update generated copier template from example
1 parent 84a7e88 commit 74f8bb5

File tree

11 files changed

+38
-21
lines changed

11 files changed

+38
-21
lines changed

{{app_name}}/acceptance-test/pom.xml.jinja

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@
3737
<artifactId>spring-boot-starter-test</artifactId>
3838
<scope>test</scope>
3939
</dependency>
40+
<dependency>
41+
<groupId>org.springframework.boot</groupId>
42+
<artifactId>spring-boot-resttestclient</artifactId>
43+
<scope>test</scope>
44+
</dependency>
4045
<dependency>
4146
<groupId>com.h2database</groupId>
4247
<artifactId>h2</artifactId>

{{app_name}}/acceptance-test/src/test/java/{{package_name}}/cucumber/SpringCucumberTestConfig.java.jinja

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ package {{package_name}}.cucumber;
33
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
44

55
import io.cucumber.spring.CucumberContextConfiguration;
6+
import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate;
67
import org.springframework.boot.test.context.SpringBootTest;
78
import org.springframework.test.context.ActiveProfiles;
89
import {{package_name}}.boot.{{domain_capitalized}}Application;
910

1011
@SpringBootTest(classes = {{domain_capitalized}}Application.class, webEnvironment = RANDOM_PORT)
1112
@CucumberContextConfiguration
1213
@ActiveProfiles("test")
14+
@AutoConfigureTestRestTemplate
1315
public class SpringCucumberTestConfig {}

{{app_name}}/acceptance-test/src/test/java/{{package_name}}/cucumber/{{domain_capitalized}}StepDef.java.jinja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import java.time.temporal.ChronoUnit;
1111
import java.util.List;
1212
import java.util.Map;
1313
import java.util.stream.Collectors;
14-
import org.springframework.boot.test.web.client.TestRestTemplate;
14+
import org.springframework.boot.resttestclient.TestRestTemplate;
1515
import org.springframework.boot.test.web.server.LocalServerPort;
1616
import org.springframework.http.HttpStatus;
1717
import org.springframework.http.ResponseEntity;

{{app_name}}/jpa-adapter/pom.xml.jinja

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<artifactId>spring-boot-starter-data-jpa</artifactId>
2222
</dependency>
2323
<dependency>
24-
<groupId>org.liquibase</groupId>
25-
<artifactId>liquibase-core</artifactId>
24+
<groupId>org.springframework.boot</groupId>
25+
<artifactId>spring-boot-starter-liquibase</artifactId>
2626
<exclusions>
2727
<exclusion>
28-
<artifactId>commons-text</artifactId>
2928
<groupId>org.apache.commons</groupId>
29+
<artifactId>commons-text</artifactId>
3030
</exclusion>
3131
</exclusions>
3232
</dependency>
@@ -53,6 +53,11 @@
5353
<artifactId>spring-boot-starter-test</artifactId>
5454
<scope>test</scope>
5555
</dependency>
56+
<dependency>
57+
<groupId>org.springframework.boot</groupId>
58+
<artifactId>spring-boot-starter-data-jpa-test</artifactId>
59+
<scope>test</scope>
60+
</dependency>
5661
<dependency>
5762
<groupId>com.h2database</groupId>
5863
<artifactId>h2</artifactId>

{{app_name}}/jpa-adapter/src/main/java/{{package_name}}/repository/config/JpaAdapterConfig.java.jinja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package {{package_name}}.repository.config;
22

3-
import org.springframework.boot.autoconfigure.domain.EntityScan;
3+
import org.springframework.boot.persistence.autoconfigure.EntityScan;
44
import org.springframework.context.annotation.Bean;
55
import org.springframework.context.annotation.Configuration;
66
import org.springframework.data.envers.repository.support.EnversRevisionRepositoryFactoryBean;

{{app_name}}/jpa-adapter/src/main/resources/preliquibase/default.sql.jinja renamed to {{app_name}}/jpa-adapter/src/main/resources/preliquibase/h2.sql.jinja

File renamed without changes.

{{app_name}}/jpa-adapter/src/test/java/{{package_name}}/repository/{{domain_capitalized}}JpaAdapterApplication.java.jinja

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package {{package_name}}.repository;
22

3-
import net.lbruun.springboot.preliquibase.PreLiquibaseAutoConfiguration;
43
import org.springframework.boot.SpringApplication;
5-
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
64
import org.springframework.boot.autoconfigure.SpringBootApplication;
75
import org.springframework.boot.test.context.TestConfiguration;
86
import org.springframework.context.annotation.Import;
@@ -17,6 +15,5 @@ public class {{domain_capitalized}}JpaAdapterApplication {
1715

1816
@TestConfiguration
1917
@Import(JpaAdapterConfig.class)
20-
@ImportAutoConfiguration({PreLiquibaseAutoConfiguration.class})
2118
static class {{domain_capitalized}}JpaTestConfig {}
2219
}

{{app_name}}/jpa-adapter/src/test/java/{{package_name}}/repository/{{domain_capitalized}}JpaTest.java.jinja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import org.junit.jupiter.api.DisplayName;
66
import org.junit.jupiter.api.Test;
77
import org.junit.jupiter.api.extension.ExtendWith;
88
import org.springframework.beans.factory.annotation.Autowired;
9-
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
9+
import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest;
1010
import org.springframework.test.context.ActiveProfiles;
1111
import org.springframework.test.context.jdbc.Sql;
1212
import org.springframework.test.context.junit.jupiter.SpringExtension;

{{app_name}}/pom.xml.jinja

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@
1313
<maven.compiler.source>${java.version}</maven.compiler.source>
1414
<maven.compiler.target>${java.version}</maven.compiler.target>
1515
<junit-jupiter.version>6.0.1</junit-jupiter.version>
16-
<spring-boot.version>3.5.7</spring-boot.version>
17-
<cucumber.version>7.31.0</cucumber.version>
18-
<springdoc-openapi-starter.version>2.8.14</springdoc-openapi-starter.version>
19-
<pre-liquibase.version>1.6.1</pre-liquibase.version>
16+
<spring-boot.version>4.0.0</spring-boot.version>
17+
<cucumber.version>7.32.0</cucumber.version>
18+
<springdoc-openapi-starter.version>3.0.0</springdoc-openapi-starter.version>
19+
<pre-liquibase.version>2.0.0</pre-liquibase.version>
2020
<otj-pg-embedded.version>1.1.1</otj-pg-embedded.version>
21-
<snakeyaml.version>2.4</snakeyaml.version>
22-
<h2.version>2.3.232</h2.version>
2321
<apache.commons.version>1.14.0</apache.commons.version>
2422
<!-- plugins -->
2523
<cukedoctor-maven-plugin.version>3.9.0</cukedoctor-maven-plugin.version>
@@ -28,10 +26,10 @@
2826
<arch-unit-maven-plugin.version>4.0.2</arch-unit-maven-plugin.version>
2927
<jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>
3028
<maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
31-
<jib-maven.plugin.version>3.4.6</jib-maven.plugin.version>
29+
<jib-maven.plugin.version>3.5.1</jib-maven.plugin.version>
3230
<git-code-format-maven-plugin.version>5.4</git-code-format-maven-plugin.version>
3331
<githook-maven-plugin.version>1.0.5</githook-maven-plugin.version>
34-
<pitest-maven-plugin.version>1.21.1</pitest-maven-plugin.version>
32+
<pitest-maven-plugin.version>1.22.0</pitest-maven-plugin.version>
3533
<pitest-junit5-plugin.version>1.2.3</pitest-junit5-plugin.version>
3634
</properties>
3735
<modules>
@@ -153,6 +151,12 @@
153151
<configuration>
154152
<source>${java.version}</source> <!-- 1.8,1.9,1.10,11,12,13 -->
155153
<target>${java.version}</target>
154+
<annotationProcessorPaths>
155+
<path>
156+
<groupId>org.projectlombok</groupId>
157+
<artifactId>lombok</artifactId>
158+
</path>
159+
</annotationProcessorPaths>
156160
</configuration>
157161
</plugin>
158162
<plugin>

{{app_name}}/rest-adapter/pom.xml.jinja

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@
3535
<artifactId>spring-boot-starter-test</artifactId>
3636
<scope>test</scope>
3737
</dependency>
38+
<dependency>
39+
<groupId>org.springframework.boot</groupId>
40+
<artifactId>spring-boot-resttestclient</artifactId>
41+
<scope>test</scope>
42+
</dependency>
3843
</dependencies>
3944
<build>
4045
<plugins>

0 commit comments

Comments
 (0)