Skip to content

Commit 7d15bfb

Browse files
jhalladey-chjhalladey-ch
authored
Merge pull request #200 from companieshouse/feature/JU-1774-dependency-upgrade-migration
Feature/ju 1774 dependency upgrade migration
2 parents a6a4ab7 + 550df05 commit 7d15bfb

File tree

4 files changed

+51
-90
lines changed

4 files changed

+51
-90
lines changed

‎Tiltfile.dev‎

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

‎pom.xml‎

Lines changed: 51 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -17,38 +17,40 @@
1717
<properties>
1818
<maven.compiler.release>21</maven.compiler.release>
1919
<ch-kafka.version>3.0.3</ch-kafka.version>
20-
<kafka-models.version>3.0.8</kafka-models.version>
20+
<kafka-models.version>3.0.18</kafka-models.version>
2121
<java.version>21</java.version>
22-
<structured-logging.version>3.0.9</structured-logging.version>
23-
<commons.lang.version>3.16.0</commons.lang.version>
24-
<commons.beanutils.version>1.9.4</commons.beanutils.version>
25-
<org.mapstruct.version>1.6.0</org.mapstruct.version>
26-
<gson.version>2.11.0</gson.version>
22+
<structured-logging.version>3.0.34</structured-logging.version>
23+
<commons.lang.version>3.17.0</commons.lang.version>
24+
<commons.beanutils.version>1.11.0</commons.beanutils.version>
25+
<org.mapstruct.version>1.6.3</org.mapstruct.version>
26+
<gson.version>2.13.1</gson.version>
2727
<hamcrest.version>3.0</hamcrest.version>
2828
<!-- system-rules: 1.17.2 is the latest version that works with JUnit 5.
2929
See https://github.com/stefanbirkner/system-rules/issues/70 -->
3030
<system-rules-version>1.17.2</system-rules-version>
31-
<spring-cloud-contract-wiremock-version>4.1.4</spring-cloud-contract-wiremock-version>
31+
<spring-cloud-contract-wiremock-version>4.3.0</spring-cloud-contract-wiremock-version>
3232
<start-class>uk.gov.companieshouse.orders.api.OrdersApiApplication</start-class>
33-
<private-api-sdk-java.version>4.0.99</private-api-sdk-java.version>
34-
<api-sdk-manager-java-library.version>3.0.5</api-sdk-manager-java-library.version>
35-
<api-sdk-java.version>6.0.9</api-sdk-java.version>
33+
<private-api-sdk-java.version>4.0.316</private-api-sdk-java.version>
34+
<api-sdk-manager-java-library.version>3.0.7</api-sdk-manager-java-library.version>
35+
<api-sdk-java.version>6.3.1</api-sdk-java.version>
3636
<api-helper-java.version>3.0.1</api-helper-java.version>
37-
<api-security-java.version>2.0.6</api-security-java.version>
38-
<spring-boot-dependencies.version>3.3.2</spring-boot-dependencies.version>
39-
<spring-boot-maven-plugin.version>3.3.2</spring-boot-maven-plugin.version>
40-
<commons-compress.version>1.27.0</commons-compress.version>
41-
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
42-
<maven-surefire-plugin.version>3.3.1</maven-surefire-plugin.version>
43-
<http3-common.version>11.0.22</http3-common.version>
44-
<test-containers.version>1.20.1</test-containers.version>
45-
<jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
46-
<spring-kafka-test.version>3.2.2</spring-kafka-test.version>
37+
<api-security-java.version>2.0.8</api-security-java.version>
38+
<spring-boot-dependencies.version>3.5.3</spring-boot-dependencies.version>
39+
<spring-boot-maven-plugin.version>3.5.3</spring-boot-maven-plugin.version>
40+
<commons-compress.version>1.27.1</commons-compress.version>
41+
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
42+
<maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
43+
<http3-common.version>11.0.25</http3-common.version>
44+
<test-containers.version>1.21.2</test-containers.version>
45+
<jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>
46+
<spring-kafka-test.version>4.0.0-M2</spring-kafka-test.version>
47+
<opentelemetry-instrumentation-bom.version>2.16.0</opentelemetry-instrumentation-bom.version>
48+
<avro.version>1.12.0</avro.version>
4749
<!-- Docker -->
48-
<jib-maven-plugin.version>3.4.1</jib-maven-plugin.version>
50+
<jib-maven-plugin.version>3.4.6</jib-maven-plugin.version>
4951

5052
<!-- sonar config -->
51-
<sonar-maven-plugin.version>4.0.0.4121</sonar-maven-plugin.version>
53+
<sonar-maven-plugin.version>5.1.0.4751</sonar-maven-plugin.version>
5254
<sonar.java.binaries>${project.basedir}/target</sonar.java.binaries>
5355
<sonar.token>${CODE_ANALYSIS_TOKEN}</sonar.token>
5456
<sonar.login></sonar.login>
@@ -70,6 +72,13 @@
7072

7173
<dependencyManagement>
7274
<dependencies>
75+
<dependency>
76+
<groupId>io.opentelemetry.instrumentation</groupId>
77+
<artifactId>opentelemetry-instrumentation-bom</artifactId>
78+
<version>${opentelemetry-instrumentation-bom.version}</version>
79+
<type>pom</type>
80+
<scope>import</scope>
81+
</dependency>
7382
<dependency>
7483
<groupId>org.springframework.boot</groupId>
7584
<artifactId>spring-boot-dependencies</artifactId>
@@ -88,6 +97,10 @@
8897
</dependencyManagement>
8998

9099
<dependencies>
100+
<dependency>
101+
<groupId>io.opentelemetry.instrumentation</groupId>
102+
<artifactId>opentelemetry-spring-boot-starter</artifactId>
103+
</dependency>
91104
<dependency>
92105
<groupId>org.springframework.boot</groupId>
93106
<artifactId>spring-boot-starter-actuator</artifactId>
@@ -122,6 +135,10 @@
122135
<groupId>org.springframework.boot</groupId>
123136
<artifactId>spring-boot-devtools</artifactId>
124137
</dependency>
138+
<dependency>
139+
<groupId>org.springframework.boot</groupId>
140+
<artifactId>spring-boot-starter-logging</artifactId>
141+
</dependency>
125142
<dependency>
126143
<groupId>org.springframework.boot</groupId>
127144
<artifactId>spring-boot-starter-web</artifactId>
@@ -154,22 +171,10 @@
154171
<dependency>
155172
<groupId>org.springframework.boot</groupId>
156173
<artifactId>spring-boot-starter-data-mongodb</artifactId>
157-
<exclusions>
158-
<exclusion>
159-
<groupId>org.springframework.boot</groupId>
160-
<artifactId>spring-boot-starter-logging</artifactId>
161-
</exclusion>
162-
</exclusions>
163174
</dependency>
164175
<dependency>
165176
<groupId>org.springframework.boot</groupId>
166177
<artifactId>spring-boot-starter-aop</artifactId>
167-
<exclusions>
168-
<exclusion>
169-
<groupId>org.springframework.boot</groupId>
170-
<artifactId>spring-boot-starter-logging</artifactId>
171-
</exclusion>
172-
</exclusions>
173178
</dependency>
174179
<dependency>
175180
<groupId>org.springframework.boot</groupId>
@@ -188,7 +193,7 @@
188193
<version>${structured-logging.version}</version>
189194
<scope>compile</scope>
190195
</dependency>
191-
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
196+
192197
<dependency>
193198
<groupId>org.apache.commons</groupId>
194199
<artifactId>commons-lang3</artifactId>
@@ -203,6 +208,17 @@
203208
<groupId>uk.gov.companieshouse</groupId>
204209
<artifactId>ch-kafka</artifactId>
205210
<version>${ch-kafka.version}</version>
211+
<exclusions>
212+
<exclusion>
213+
<groupId>org.apache.avro</groupId>
214+
<artifactId>avro</artifactId>
215+
</exclusion>
216+
</exclusions>
217+
</dependency>
218+
<dependency>
219+
<groupId>org.apache.avro</groupId>
220+
<artifactId>avro</artifactId>
221+
<version>${avro.version}</version>
206222
</dependency>
207223
<dependency>
208224
<groupId>uk.gov.companieshouse</groupId>
@@ -213,7 +229,6 @@
213229
<groupId>org.springframework.kafka</groupId>
214230
<artifactId>spring-kafka-test</artifactId>
215231
<scope>test</scope>
216-
<version>${spring-kafka-test.version}</version>
217232
<exclusions>
218233
<exclusion>
219234
<groupId>org.pcollections</groupId>

‎routes.yaml‎

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

‎start.sh‎

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

0 commit comments

Comments
 (0)