Skip to content

Commit 22d45dd

Browse files
francastagnafrancastagna
authored
Merge branch 'master' into feature/mu-plus-lambda
2 parents e6acbef + b0c0e92 commit 22d45dd

File tree

7 files changed

+212
-169
lines changed

7 files changed

+212
-169
lines changed

‎client-java/instrumentation/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@
1212
<packaging>jar</packaging>
1313
<name>${project.groupId}:${project.artifactId}</name>
1414

15-
<properties>
16-
<!-- THOSE ARE ONLY FOR TESTING -->
17-
<springboot.version>2.5.4</springboot.version>
18-
</properties>
19-
2015

2116
<dependencies>
2217
<dependency>

‎client-java/pom.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,19 @@
3636
</license>
3737
</licenses>
3838

39+
<properties>
40+
<!-- THOSE ARE ONLY FOR TESTING -->
41+
<springboot.version>2.5.4</springboot.version>
42+
</properties>
43+
44+
45+
<!--
46+
"client-java" lives separately from "core".
47+
where core tries to be on latest LTS, the client-java is stuck on old version to maximize its usability.
48+
as such, to avoid dependency hell, versions of libraries should not be in root pom.xml file.
49+
but rather in the top submodules.
50+
TODO there is ongoing effort to do this refactoring, but it will take a while
51+
-->
3952
<dependencyManagement>
4053
<dependencies>
4154
<dependency>

‎core-parent/pom.xml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,60 @@
1313
<packaging>pom</packaging>
1414
<name>${project.groupId}:${project.artifactId}</name>
1515

16+
<properties>
17+
<!-- upgrading to 1.0.68 breaks Spring... TODO would need try upgrading in own branch -->
18+
<swagger.parser-v2.version>1.0.61</swagger.parser-v2.version>
19+
<!-- upgrading to 2.1.18 breaks Spring... TODO would need try upgrading in own branch -->
20+
<swagger.parser-v3.version>2.1.8</swagger.parser-v3.version>
21+
<swagger.annotations.version>2.2.7</swagger.annotations.version>
22+
</properties>
23+
24+
<dependencyManagement>
25+
<dependencies>
26+
<!-- Dependency Injection -->
27+
<dependency>
28+
<groupId>com.google.inject</groupId>
29+
<artifactId>guice</artifactId>
30+
<version>5.0.1</version>
31+
</dependency>
32+
<dependency> <!-- This is needed as Guice has no LifeCycle management -->
33+
<groupId>com.netflix.governator</groupId>
34+
<artifactId>governator</artifactId>
35+
<version>1.17.12</version>
36+
<exclusions>
37+
<!--It looks like it uses quite a few old versions -->
38+
<exclusion>
39+
<groupId>org.hibernate</groupId>
40+
<artifactId>hibernate-validator</artifactId>
41+
</exclusion>
42+
<exclusion>
43+
<groupId>com.fasterxml.jackson.core</groupId>
44+
<artifactId>jackson-databind</artifactId>
45+
</exclusion>
46+
</exclusions>
47+
</dependency>
48+
49+
<!-- OpenApi/Swagger Parser-->
50+
<dependency>
51+
<groupId>io.swagger</groupId>
52+
<artifactId>swagger-parser</artifactId>
53+
<version>${swagger.parser-v2.version}</version>
54+
</dependency>
55+
<dependency>
56+
<groupId>io.swagger.parser.v3</groupId>
57+
<artifactId>swagger-parser</artifactId>
58+
<version>${swagger.parser-v3.version}</version>
59+
</dependency>
60+
<dependency>
61+
<groupId>io.swagger.core.v3</groupId>
62+
<artifactId>swagger-annotations</artifactId>
63+
<version>${swagger.annotations.version}</version>
64+
</dependency>
65+
<dependency>
66+
<groupId>com.atlassian.oai</groupId>
67+
<artifactId>swagger-request-validator-core</artifactId>
68+
<version>2.44.9</version>
69+
</dependency>
70+
</dependencies>
71+
</dependencyManagement>
1672
</project>

‎core-tests/e2e-tests/dropwizard-examples/pom.xml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,70 @@
1111
<artifactId>evomaster-e2e-tests-dropwizard-examples</artifactId>
1212
<packaging>jar</packaging>
1313

14+
<properties>
15+
<dropwizard.version>1.3.7</dropwizard.version>
16+
<swagger.version>1.6.1</swagger.version>
17+
</properties>
18+
19+
<dependencyManagement>
20+
<dependencies>
21+
<!-- DropWizard -->
22+
<dependency>
23+
<groupId>io.dropwizard</groupId>
24+
<artifactId>dropwizard-core</artifactId>
25+
<version>${dropwizard.version}</version>
26+
</dependency>
27+
<dependency>
28+
<groupId>io.dropwizard</groupId>
29+
<artifactId>dropwizard-assets</artifactId>
30+
<version>${dropwizard.version}</version>
31+
</dependency>
32+
<dependency>
33+
<groupId>io.dropwizard</groupId>
34+
<artifactId>dropwizard-testing</artifactId>
35+
<version>${dropwizard.version}</version>
36+
<scope>test</scope>
37+
</dependency>
38+
<dependency>
39+
<groupId>io.dropwizard</groupId>
40+
<artifactId>dropwizard-jetty</artifactId>
41+
<version>${dropwizard.version}</version>
42+
<exclusions>
43+
<exclusion>
44+
<groupId>org.eclipse.jetty</groupId>
45+
<artifactId>*</artifactId>
46+
</exclusion>
47+
</exclusions>
48+
</dependency>
49+
<!--
50+
Swagger for JaxRS
51+
TODO: at the moment, only used for Dropwizard test.
52+
We ll need to update to v3 version
53+
-->
54+
<dependency>
55+
<groupId>io.swagger</groupId>
56+
<artifactId>swagger-jaxrs</artifactId>
57+
<version>${swagger.version}</version>
58+
<exclusions>
59+
<exclusion>
60+
<groupId>com.fasterxml.jackson.core</groupId>
61+
<artifactId>jackson-databind</artifactId>
62+
</exclusion>
63+
</exclusions>
64+
</dependency>
65+
<dependency>
66+
<groupId>io.swagger</groupId>
67+
<artifactId>swagger-jersey2-jaxrs</artifactId>
68+
<version>${swagger.version}</version>
69+
</dependency>
70+
<dependency>
71+
<groupId>io.swagger</groupId>
72+
<artifactId>swagger-hibernate-validations</artifactId>
73+
<version>${swagger.version}</version>
74+
</dependency>
75+
</dependencies>
76+
</dependencyManagement>
77+
1478

1579
<dependencies>
1680

‎core-tests/e2e-tests/micronaut-latest/pom.xml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,77 @@
1414
<properties>
1515
<exec.mainClass>com.foo.micronaut.latest.MicronautApplication</exec.mainClass>
1616
<micronaut.runtime>netty</micronaut.runtime>
17+
<micronaut.version>3.2.7</micronaut.version>
18+
<micronaut.openapi.version>3.2.0</micronaut.openapi.version>
19+
<micronaut.test.version>3.0.5</micronaut.test.version>
20+
<swagger.version>1.6.1</swagger.version>
1721
</properties>
1822

23+
<dependencyManagement>
24+
<dependencies>
25+
<!-- Micronaut -->
26+
<dependency>
27+
<groupId>io.micronaut</groupId>
28+
<artifactId>micronaut-bom</artifactId>
29+
<version>${micronaut.version}</version>
30+
</dependency>
31+
32+
<dependency>
33+
<groupId>io.micronaut</groupId>
34+
<artifactId>micronaut-inject</artifactId>
35+
<version>${micronaut.version}</version>
36+
</dependency>
37+
<dependency>
38+
<groupId>io.micronaut</groupId>
39+
<artifactId>micronaut-validation</artifactId>
40+
<version>${micronaut.version}</version>
41+
</dependency>
42+
<dependency>
43+
<groupId>io.micronaut.test</groupId>
44+
<artifactId>micronaut-test-junit5</artifactId>
45+
<version>${micronaut.test.version}</version>
46+
</dependency>
47+
<dependency>
48+
<groupId>io.micronaut</groupId>
49+
<artifactId>micronaut-http-client</artifactId>
50+
<version>${micronaut.version}</version>
51+
</dependency>
52+
<dependency>
53+
<groupId>io.micronaut</groupId>
54+
<artifactId>micronaut-http-server-netty</artifactId>
55+
<version>${micronaut.version}</version>
56+
</dependency>
57+
<dependency>
58+
<groupId>io.micronaut</groupId>
59+
<artifactId>micronaut-jackson-databind</artifactId>
60+
<version>${micronaut.version}</version>
61+
</dependency>
62+
<dependency>
63+
<groupId>io.micronaut</groupId>
64+
<artifactId>micronaut-runtime</artifactId>
65+
<version>${micronaut.version}</version>
66+
</dependency>
67+
<dependency>
68+
<groupId>io.micronaut</groupId>
69+
<artifactId>micronaut-core</artifactId>
70+
<version>${micronaut.version}</version>
71+
</dependency>
72+
73+
<dependency>
74+
<groupId>io.swagger</groupId>
75+
<artifactId>swagger-jaxrs</artifactId>
76+
<version>${swagger.version}</version>
77+
<exclusions>
78+
<exclusion>
79+
<groupId>com.fasterxml.jackson.core</groupId>
80+
<artifactId>jackson-databind</artifactId>
81+
</exclusion>
82+
</exclusions>
83+
</dependency>
84+
85+
</dependencies>
86+
</dependencyManagement>
87+
1988
<dependencies>
2089
<dependency>
2190
<groupId>org.evomaster</groupId>

‎core-tests/pom.xml‎

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,38 +17,17 @@
1717
<module>integration-tests</module>
1818
</modules>
1919

20+
21+
22+
2023
<dependencyManagement>
2124
<dependencies>
22-
<!-- DropWizard -->
23-
<dependency>
24-
<groupId>io.dropwizard</groupId>
25-
<artifactId>dropwizard-core</artifactId>
26-
<version>${dropwizard.version}</version>
27-
</dependency>
28-
<dependency>
29-
<groupId>io.dropwizard</groupId>
30-
<artifactId>dropwizard-assets</artifactId>
31-
<version>${dropwizard.version}</version>
32-
</dependency>
33-
<dependency>
34-
<groupId>io.dropwizard</groupId>
35-
<artifactId>dropwizard-testing</artifactId>
36-
<version>${dropwizard.version}</version>
37-
<scope>test</scope>
38-
</dependency>
39-
<dependency>
40-
<groupId>io.dropwizard</groupId>
41-
<artifactId>dropwizard-jetty</artifactId>
42-
<version>${dropwizard.version}</version>
43-
<exclusions>
44-
<exclusion>
45-
<groupId>org.eclipse.jetty</groupId>
46-
<artifactId>*</artifactId>
47-
</exclusion>
48-
</exclusions>
49-
</dependency>
50-
51-
<!-- Spring -->
25+
<!--
26+
Spring Dependencies.
27+
Spring the framework of choice for writing IT and E2E tests, as it is the most
28+
popular framework.
29+
When unsure what to use for a test, use Spring
30+
-->
5231
<dependency>
5332
<groupId>org.springframework.boot</groupId>
5433
<artifactId>spring-boot</artifactId>

0 commit comments

Comments
 (0)