Skip to content

Commit 38f40d9

Browse files
arcuri82arcuri82
committed
fixing dependencies and CI
1 parent 06b510a commit 38f40d9

4 files changed

Lines changed: 169 additions & 90 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ jobs:
349349
CI_env: GithubAction
350350
- name: Run BB E2E tests
351351
# important that what we run here does not use Docker
352-
working-directory: core-tests/e2e-tests/spring-rest-bb
352+
working-directory: core-tests/e2e-tests/spring/spring-rest-bb
353353
run: mvn clean verify --fae
354354
env:
355355
CI_env: GithubAction

‎core-tests/e2e-tests/spring/pom.xml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,86 @@
3333
<module>spring-rpc-thrift</module>
3434
</modules>
3535

36+
<dependencyManagement>
37+
<dependencies>
38+
<!-- Spring Dependencies. -->
39+
<dependency>
40+
<groupId>org.springframework.boot</groupId>
41+
<artifactId>spring-boot</artifactId>
42+
<version>${springboot.version}</version>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.springframework.boot</groupId>
46+
<artifactId>spring-boot-starter-web</artifactId>
47+
<version>${springboot.version}</version>
48+
</dependency>
49+
<dependency>
50+
<groupId>org.springframework.boot</groupId>
51+
<artifactId>spring-boot-starter-data-jpa</artifactId>
52+
<version>${springboot.version}</version>
53+
</dependency>
54+
<dependency>
55+
<groupId>org.springframework.boot</groupId>
56+
<artifactId>spring-boot-starter-security</artifactId>
57+
<version>${springboot.version}</version>
58+
</dependency>
59+
<dependency>
60+
<groupId>org.springframework.boot</groupId>
61+
<artifactId>spring-boot-starter-validation</artifactId>
62+
<version>${springboot.version}</version>
63+
</dependency>
64+
<dependency>
65+
<groupId>org.springframework.boot</groupId>
66+
<artifactId>spring-boot-starter-test</artifactId>
67+
<scope>test</scope>
68+
<version>${springboot.version}</version>
69+
</dependency>
70+
<dependency>
71+
<groupId>org.springframework.boot</groupId>
72+
<artifactId>spring-boot-starter-data-mongodb</artifactId>
73+
<version>${springboot.version}</version>
74+
</dependency>
75+
<dependency>
76+
<groupId>org.springframework.boot</groupId>
77+
<artifactId>spring-boot-starter-data-redis</artifactId>
78+
<version>${springboot.version}</version>
79+
</dependency>
80+
<dependency>
81+
<groupId>org.springframework.data</groupId>
82+
<artifactId>spring-data-redis</artifactId>
83+
<version>${org.springframework.data.version}</version>
84+
</dependency>
85+
86+
<!-- SpringFox: Swagger documentation for SpringBoot-->
87+
<dependency>
88+
<groupId>io.springfox</groupId>
89+
<artifactId>springfox-swagger2</artifactId>
90+
<version>${springfox.version}</version>
91+
</dependency>
92+
<dependency>
93+
<groupId>io.springfox</groupId>
94+
<artifactId>springfox-spring-web</artifactId>
95+
<version>${springfox.version}</version>
96+
</dependency>
97+
98+
<!-- SpringDoc: Swagger/OpenApi documentation for SpringBoot-->
99+
<dependency>
100+
<groupId>org.springdoc</groupId>
101+
<artifactId>springdoc-openapi-ui</artifactId>
102+
<version>${springdoc.version}</version>
103+
</dependency>
104+
<dependency>
105+
<groupId>org.springdoc</groupId>
106+
<artifactId>springdoc-openapi-security</artifactId>
107+
<version>${springdoc.version}</version>
108+
</dependency>
109+
<dependency>
110+
<groupId>org.springdoc</groupId>
111+
<artifactId>springdoc-openapi-kotlin</artifactId>
112+
<version>${springdoc.version}</version>
113+
</dependency>
114+
115+
</dependencies>
116+
</dependencyManagement>
36117

37118
</project>

‎core-tests/integration-tests/pom.xml‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,87 @@
1717
<module>core-graphql-it</module>
1818
<module>core-it</module>
1919
</modules>
20+
21+
<dependencyManagement>
22+
<dependencies>
23+
<!-- Spring Dependencies. -->
24+
<dependency>
25+
<groupId>org.springframework.boot</groupId>
26+
<artifactId>spring-boot</artifactId>
27+
<version>${springboot.version}</version>
28+
</dependency>
29+
<dependency>
30+
<groupId>org.springframework.boot</groupId>
31+
<artifactId>spring-boot-starter-web</artifactId>
32+
<version>${springboot.version}</version>
33+
</dependency>
34+
<dependency>
35+
<groupId>org.springframework.boot</groupId>
36+
<artifactId>spring-boot-starter-data-jpa</artifactId>
37+
<version>${springboot.version}</version>
38+
</dependency>
39+
<dependency>
40+
<groupId>org.springframework.boot</groupId>
41+
<artifactId>spring-boot-starter-security</artifactId>
42+
<version>${springboot.version}</version>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.springframework.boot</groupId>
46+
<artifactId>spring-boot-starter-validation</artifactId>
47+
<version>${springboot.version}</version>
48+
</dependency>
49+
<dependency>
50+
<groupId>org.springframework.boot</groupId>
51+
<artifactId>spring-boot-starter-test</artifactId>
52+
<scope>test</scope>
53+
<version>${springboot.version}</version>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.springframework.boot</groupId>
57+
<artifactId>spring-boot-starter-data-mongodb</artifactId>
58+
<version>${springboot.version}</version>
59+
</dependency>
60+
<dependency>
61+
<groupId>org.springframework.boot</groupId>
62+
<artifactId>spring-boot-starter-data-redis</artifactId>
63+
<version>${springboot.version}</version>
64+
</dependency>
65+
<dependency>
66+
<groupId>org.springframework.data</groupId>
67+
<artifactId>spring-data-redis</artifactId>
68+
<version>${org.springframework.data.version}</version>
69+
</dependency>
70+
71+
<!-- SpringFox: Swagger documentation for SpringBoot-->
72+
<dependency>
73+
<groupId>io.springfox</groupId>
74+
<artifactId>springfox-swagger2</artifactId>
75+
<version>${springfox.version}</version>
76+
</dependency>
77+
<dependency>
78+
<groupId>io.springfox</groupId>
79+
<artifactId>springfox-spring-web</artifactId>
80+
<version>${springfox.version}</version>
81+
</dependency>
82+
83+
<!-- SpringDoc: Swagger/OpenApi documentation for SpringBoot-->
84+
<dependency>
85+
<groupId>org.springdoc</groupId>
86+
<artifactId>springdoc-openapi-ui</artifactId>
87+
<version>${springdoc.version}</version>
88+
</dependency>
89+
<dependency>
90+
<groupId>org.springdoc</groupId>
91+
<artifactId>springdoc-openapi-security</artifactId>
92+
<version>${springdoc.version}</version>
93+
</dependency>
94+
<dependency>
95+
<groupId>org.springdoc</groupId>
96+
<artifactId>springdoc-openapi-kotlin</artifactId>
97+
<version>${springdoc.version}</version>
98+
</dependency>
99+
100+
</dependencies>
101+
</dependencyManagement>
102+
20103
</project>

‎core-tests/pom.xml‎

Lines changed: 4 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -18,97 +18,12 @@
1818
</modules>
1919

2020
<properties>
21+
<!--
22+
Spring the framework of choice for writing IT and E2E tests, as it is the most popular framework.
23+
When unsure what to use for a test, use Spring
24+
-->
2125
<springdoc.version>1.6.9</springdoc.version>
2226
<springboot.version>2.5.4</springboot.version>
2327
</properties>
2428

25-
26-
27-
28-
<dependencyManagement>
29-
<dependencies>
30-
<!--
31-
Spring Dependencies.
32-
Spring the framework of choice for writing IT and E2E tests, as it is the most
33-
popular framework.
34-
When unsure what to use for a test, use Spring
35-
-->
36-
<dependency>
37-
<groupId>org.springframework.boot</groupId>
38-
<artifactId>spring-boot</artifactId>
39-
<version>${springboot.version}</version>
40-
</dependency>
41-
<dependency>
42-
<groupId>org.springframework.boot</groupId>
43-
<artifactId>spring-boot-starter-web</artifactId>
44-
<version>${springboot.version}</version>
45-
</dependency>
46-
<dependency>
47-
<groupId>org.springframework.boot</groupId>
48-
<artifactId>spring-boot-starter-data-jpa</artifactId>
49-
<version>${springboot.version}</version>
50-
</dependency>
51-
<dependency>
52-
<groupId>org.springframework.boot</groupId>
53-
<artifactId>spring-boot-starter-security</artifactId>
54-
<version>${springboot.version}</version>
55-
</dependency>
56-
<dependency>
57-
<groupId>org.springframework.boot</groupId>
58-
<artifactId>spring-boot-starter-validation</artifactId>
59-
<version>${springboot.version}</version>
60-
</dependency>
61-
<dependency>
62-
<groupId>org.springframework.boot</groupId>
63-
<artifactId>spring-boot-starter-test</artifactId>
64-
<scope>test</scope>
65-
<version>${springboot.version}</version>
66-
</dependency>
67-
<dependency>
68-
<groupId>org.springframework.boot</groupId>
69-
<artifactId>spring-boot-starter-data-mongodb</artifactId>
70-
<version>${springboot.version}</version>
71-
</dependency>
72-
<dependency>
73-
<groupId>org.springframework.boot</groupId>
74-
<artifactId>spring-boot-starter-data-redis</artifactId>
75-
<version>${springboot.version}</version>
76-
</dependency>
77-
<dependency>
78-
<groupId>org.springframework.data</groupId>
79-
<artifactId>spring-data-redis</artifactId>
80-
<version>${org.springframework.data.version}</version>
81-
</dependency>
82-
83-
<!-- SpringFox: Swagger documentation for SpringBoot-->
84-
<dependency>
85-
<groupId>io.springfox</groupId>
86-
<artifactId>springfox-swagger2</artifactId>
87-
<version>${springfox.version}</version>
88-
</dependency>
89-
<dependency>
90-
<groupId>io.springfox</groupId>
91-
<artifactId>springfox-spring-web</artifactId>
92-
<version>${springfox.version}</version>
93-
</dependency>
94-
95-
<!-- SpringDoc: Swagger/OpenApi documentation for SpringBoot-->
96-
<dependency>
97-
<groupId>org.springdoc</groupId>
98-
<artifactId>springdoc-openapi-ui</artifactId>
99-
<version>${springdoc.version}</version>
100-
</dependency>
101-
<dependency>
102-
<groupId>org.springdoc</groupId>
103-
<artifactId>springdoc-openapi-security</artifactId>
104-
<version>${springdoc.version}</version>
105-
</dependency>
106-
<dependency>
107-
<groupId>org.springdoc</groupId>
108-
<artifactId>springdoc-openapi-kotlin</artifactId>
109-
<version>${springdoc.version}</version>
110-
</dependency>
111-
112-
</dependencies>
113-
</dependencyManagement>
11429
</project>

0 commit comments

Comments
 (0)