Skip to content

Commit 14c530f

Browse files
Giuseppe Falco-ScampatelliElvenSpellmaker
Giuseppe Falco-Scampatelli
authored and
ElvenSpellmaker
committed
updated classes to compile due to upgrade to spring boot 3. No functional changes
Signed-off-by: Jack Blower <[email protected]>
1 parent 6bfff08 commit 14c530f

25 files changed

+142
-253
lines changed

‎build/azDevOps/azure/azure-pipelines-javaspring-k8s.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ resources:
2424
repositories:
2525
- repository: templates
2626
type: github
27-
name: amido/stacks-pipeline-templates
27+
name: Ensono/stacks-pipeline-templates
2828
ref: feature/cycle4
2929
# EXCHANGE THIS FOR YOUR OWN ENDPOINT CONNECTION TO GITHUB
3030
# REPOSITORY IS PUBLIC
@@ -33,14 +33,14 @@ resources:
3333
containers:
3434
# Container for Java Build and Testing
3535
- container: azul_java
36-
image: azul/zulu-openjdk-debian:11
36+
image: amidostacks/runner-pwsh-java:0.4.48-stable
3737
# Container for inlining Jacoco assets as Azure DevOps strips them
3838
# https://github.com/microsoft/azure-pipelines-tasks/issues/3027
3939
- container: node
4040
image: amidostacks/node-14:0.0.1
4141
# Container for Sonar Scanner
4242
- container: sonar_scanner
43-
image: amidostacks/ci-sonarscanner:0.0.2
43+
image: amidostacks/runner-pwsh-dotnet:0.4.51-stable
4444
# Container for Kubernetes Deployment
4545
- container: k8s_deploy
4646
image: amidostacks/ci-k8s:0.0.12
@@ -89,7 +89,7 @@ variables:
8989
- name: version_minor
9090
value: 0
9191
- name: version_patch
92-
value: 0
92+
value: 1
9393
- name: version_number
9494
value: $(version_major).$(version_minor).$(version_patch)
9595

‎java/.mvn/jvm.config

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
2+
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
3+
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
4+
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
5+
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
6+
--add-opens=java.base/java.util=ALL-UNNAMED
7+
--add-opens=java.base/java.lang=ALL-UNNAMED
8+
--add-opens=java.base/java.lang.invoke=ALL-UNNAMED
9+
--add-opens java.base/java.lang.reflect=ALL-UNNAMED
10+
--add-opens java.base/java.text=ALL-UNNAMED
11+
--add-opens java.desktop/java.awt.font=ALL-UNNAMED

‎java/pom.xml

Lines changed: 31 additions & 166 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<parent>
8-
<groupId>org.springframework.boot</groupId>
9-
<artifactId>spring-boot-starter-parent</artifactId>
10-
<version>2.6.1</version>
11-
<relativePath/>
12-
<!-- lookup parent from repository -->
8+
<groupId>com.amido.stacks.modules</groupId>
9+
<artifactId>stacks-modules-parent</artifactId>
10+
<version>2.0.7-RELEASE</version>
1311
</parent>
1412

1513
<groupId>com.amido.stacks.workloads</groupId>
@@ -20,52 +18,23 @@
2018
<description>Demo project for Java</description>
2119

2220
<properties>
23-
<stacks.core.api.version>1.0.3.2-RELEASE</stacks.core.api.version>
24-
<stacks.core.commons.version>1.0.3</stacks.core.commons.version>
21+
<stacks.core.api.version>1.0.5.11-RELEASE</stacks.core.api.version>
22+
<stacks.core.commons.version>2.0.7</stacks.core.commons.version>
2523

2624
<!-- Stacks features -->
2725
<aws.profile.name>no-aws</aws.profile.name>
2826
<azure.profile.name>no-azure</azure.profile.name>
2927

30-
<java.version>11</java.version>
31-
<org.projectlombok.version>1.18.0</org.projectlombok.version>
32-
<org.springdoc-openapi.version>1.6.1</org.springdoc-openapi.version>
3328
<applicationinsights.version>2.6.4</applicationinsights.version>
34-
<azure.springboot.version>3.6.0</azure.springboot.version>
35-
<jackson.version>2.13.0</jackson.version>
36-
<mockito.version>4.1.0</mockito.version>
37-
<lombok.version>1.18.22</lombok.version>
38-
<hamcrest.version>2.2</hamcrest.version>
39-
<pitest.version>1.7.3</pitest.version>
40-
<jacoco.version>0.8.7</jacoco.version>
41-
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
42-
<maven-surefire-phase>test</maven-surefire-phase>
43-
<junit-jupiter.version>5.8.2</junit-jupiter.version>
44-
<equals-verifier.version>3.8.1</equals-verifier.version>
45-
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
46-
<owasp-dependency-check-plugin.version>6.5.0</owasp-dependency-check-plugin.version>
47-
<auth0-spring-security-api.version>1.4.1</auth0-spring-security-api.version>
48-
<io-projectreactor-netty.version>1.0.11</io-projectreactor-netty.version>
49-
<ch.qos.logback.logback-core.version>1.2.8</ch.qos.logback.logback-core.version>
50-
<net.minidev.json-smart-version>2.4.7</net.minidev.json-smart-version>
51-
<com.beust.jcommander-version>1.81</com.beust.jcommander-version>
29+
<azure.springboot.version>4.0.0</azure.springboot.version>
5230
<au.com.dius.pact-jvm-provider-spring.version>4.0.10
5331
</au.com.dius.pact-jvm-provider-spring.version>
5432
<au.com.dius.pact.consumer-version>4.3.2</au.com.dius.pact.consumer-version>
55-
<com.nimbusds.oauth2-oidc-sdk-version>9.9</com.nimbusds.oauth2-oidc-sdk-version>
5633
<au.com.dius.pact.provider.maven-version>4.2.7</au.com.dius.pact.provider.maven-version>
57-
<log4j-version>2.17.0</log4j-version>
58-
<org.mapstruct.version>1.5.2.Final</org.mapstruct.version>
59-
<aws-java-sdk-s3.version>1.12.273</aws-java-sdk-s3.version>
34+
<aws-java-sdk-s3.version>1.12.470</aws-java-sdk-s3.version>
6035
<aspectjweaver.version>1.9.9.1</aspectjweaver.version>
61-
62-
<fmt-maven-plugin.version>2.13</fmt-maven-plugin.version>
63-
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
64-
<puppycrawl-tools-checkstyle.version>9.2</puppycrawl-tools-checkstyle.version>
65-
<spotbugs-maven-plugin.version>4.2.3</spotbugs-maven-plugin.version>
66-
<spotbugs.version>4.5.2</spotbugs.version>
6736
<exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
68-
37+
<spring.cloud.dependencies.version>2022.0.4</spring.cloud.dependencies.version>
6938
<pact.version>3.5.24</pact.version>
7039

7140
<!-- Set 'pact.broker.url' and 'pact.broker.token' -->
@@ -79,11 +48,13 @@
7948

8049
<dependencyManagement>
8150
<dependencies>
51+
<!-- https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-dependencies -->
8252
<dependency>
83-
<groupId>io.projectreactor</groupId>
84-
<artifactId>reactor-bom</artifactId>
85-
<version>2020.0.14</version>
53+
<groupId>org.springframework.cloud</groupId>
54+
<artifactId>spring-cloud-dependencies</artifactId>
55+
<version>${spring.cloud.dependencies.version}</version>
8656
<type>pom</type>
57+
<scope>import</scope>
8758
</dependency>
8859
</dependencies>
8960
</dependencyManagement>
@@ -111,54 +82,49 @@
11182

11283
<dependency>
11384
<groupId>org.springframework.boot</groupId>
114-
<artifactId>spring-boot-starter-actuator</artifactId>
85+
<artifactId>spring-boot-properties-migrator</artifactId>
86+
<scope>runtime</scope>
11587
</dependency>
11688

11789
<dependency>
118-
<groupId>org.springframework.boot</groupId>
119-
<artifactId>spring-boot-starter-web</artifactId>
90+
<groupId>org.springframework.cloud</groupId>
91+
<artifactId>spring-cloud-starter-bootstrap</artifactId>
12092
</dependency>
12193

12294
<dependency>
123-
<groupId>org.springdoc</groupId>
124-
<artifactId>springdoc-openapi-ui</artifactId>
125-
<version>${org.springdoc-openapi.version}</version>
95+
<groupId>org.springframework.cloud</groupId>
96+
<artifactId>spring-cloud-starter-config</artifactId>
12697
</dependency>
12798

12899
<dependency>
129-
<groupId>org.springdoc</groupId>
130-
<artifactId>springdoc-openapi-data-rest</artifactId>
131-
<version>${org.springdoc-openapi.version}</version>
100+
<groupId>org.springframework.boot</groupId>
101+
<artifactId>spring-boot-starter-actuator</artifactId>
132102
<exclusions>
133103
<exclusion>
134-
<groupId>net.minidev</groupId>
135-
<artifactId>json-smart</artifactId>
104+
<groupId>org.yaml</groupId>
105+
<artifactId>snakeyaml</artifactId>
136106
</exclusion>
137107
</exclusions>
138108
</dependency>
139109

140110
<dependency>
141-
<groupId>org.apache.logging.log4j</groupId>
142-
<artifactId>log4j-api</artifactId>
143-
<version>${log4j-version}</version>
111+
<groupId>org.springframework.boot</groupId>
112+
<artifactId>spring-boot-starter-web</artifactId>
144113
</dependency>
145114

146115
<dependency>
147116
<groupId>com.fasterxml.jackson.core</groupId>
148117
<artifactId>jackson-core</artifactId>
149-
<version>${jackson.version}</version>
150118
</dependency>
151119

152120
<dependency>
153121
<groupId>com.fasterxml.jackson.core</groupId>
154122
<artifactId>jackson-databind</artifactId>
155-
<version>${jackson.version}</version>
156123
</dependency>
157124

158125
<dependency>
159126
<groupId>com.fasterxml.jackson.core</groupId>
160127
<artifactId>jackson-annotations</artifactId>
161-
<version>${jackson.version}</version>
162128
</dependency>
163129

164130
<dependency>
@@ -199,36 +165,20 @@
199165
</exclusions>
200166
</dependency>
201167

202-
<dependency>
203-
<groupId>ch.qos.logback</groupId>
204-
<artifactId>logback-core</artifactId>
205-
<version>${ch.qos.logback.logback-core.version}</version>
206-
</dependency>
207-
208168
<dependency>
209169
<groupId>net.minidev</groupId>
210170
<artifactId>json-smart</artifactId>
211-
<version>${net.minidev.json-smart-version}</version>
212171
</dependency>
213172

214173
<dependency>
215174
<groupId>com.beust</groupId>
216175
<artifactId>jcommander</artifactId>
217-
<version>${com.beust.jcommander-version}</version>
218176
</dependency>
219177

220178
<!-- Registering the Auth0 Dependency-->
221179
<dependency>
222180
<groupId>com.auth0</groupId>
223181
<artifactId>auth0-spring-security-api</artifactId>
224-
<version>${auth0-spring-security-api.version}</version>
225-
</dependency>
226-
227-
<dependency>
228-
<groupId>org.projectlombok</groupId>
229-
<artifactId>lombok</artifactId>
230-
<version>${lombok.version}</version>
231-
<scope>provided</scope>
232182
</dependency>
233183

234184
<dependency>
@@ -251,41 +201,6 @@
251201
</exclusions>
252202
</dependency>
253203

254-
<dependency>
255-
<groupId>org.junit.jupiter</groupId>
256-
<artifactId>junit-jupiter-api</artifactId>
257-
<version>${junit-jupiter.version}</version>
258-
<scope>test</scope>
259-
</dependency>
260-
261-
<dependency>
262-
<groupId>org.junit.jupiter</groupId>
263-
<artifactId>junit-jupiter-engine</artifactId>
264-
<version>${junit-jupiter.version}</version>
265-
<scope>test</scope>
266-
</dependency>
267-
268-
<dependency>
269-
<groupId>org.mockito</groupId>
270-
<artifactId>mockito-junit-jupiter</artifactId>
271-
<version>${mockito.version}</version>
272-
<scope>test</scope>
273-
</dependency>
274-
275-
<dependency>
276-
<groupId>org.hamcrest</groupId>
277-
<artifactId>hamcrest</artifactId>
278-
<version>${hamcrest.version}</version>
279-
<scope>test</scope>
280-
</dependency>
281-
282-
<dependency>
283-
<groupId>nl.jqno.equalsverifier</groupId>
284-
<artifactId>equalsverifier</artifactId>
285-
<version>${equals-verifier.version}</version>
286-
<scope>test</scope>
287-
</dependency>
288-
289204
<dependency>
290205
<groupId>au.com.dius</groupId>
291206
<artifactId>pact-jvm-provider-spring</artifactId>
@@ -303,14 +218,12 @@
303218
<dependency>
304219
<groupId>org.pitest</groupId>
305220
<artifactId>pitest-parent</artifactId>
306-
<version>${pitest.version}</version>
307221
<type>pom</type>
308222
</dependency>
309223

310224
<dependency>
311225
<groupId>com.nimbusds</groupId>
312226
<artifactId>oauth2-oidc-sdk</artifactId>
313-
<version>${com.nimbusds.oauth2-oidc-sdk-version}</version>
314227
<scope>runtime</scope>
315228
</dependency>
316229

@@ -319,63 +232,16 @@
319232
<artifactId>aws-java-sdk-s3</artifactId>
320233
<version>${aws-java-sdk-s3.version}</version>
321234
</dependency>
322-
323-
</dependencies>
324235

325-
<reporting>
326-
<plugins>
327-
<plugin>
328-
<groupId>org.apache.maven.plugins</groupId>
329-
<artifactId>maven-surefire-report-plugin</artifactId>
330-
<version>${maven-surefire-plugin.version}</version>
331-
</plugin>
332-
</plugins>
333-
</reporting>
236+
<dependency>
237+
<groupId>jakarta.persistence</groupId>
238+
<artifactId>jakarta.persistence-api</artifactId>
239+
</dependency>
240+
241+
</dependencies>
334242

335243
<build>
336244
<plugins>
337-
<plugin>
338-
<groupId>org.apache.maven.plugins</groupId>
339-
<artifactId>maven-compiler-plugin</artifactId>
340-
<version>${maven-compiler-plugin.version}</version>
341-
<configuration>
342-
<source>11</source>
343-
<target>11</target>
344-
<annotationProcessorPaths>
345-
<path>
346-
<groupId>org.projectlombok</groupId>
347-
<artifactId>lombok</artifactId>
348-
<version>${lombok.version}</version>
349-
</path>
350-
<!-- This is needed when using Lombok 1.18.16 and above -->
351-
<path>
352-
<groupId>org.projectlombok</groupId>
353-
<artifactId>lombok-mapstruct-binding</artifactId>
354-
<version>0.2.0</version>
355-
</path>
356-
<!-- Mapstruct should follow the lombok path(s) -->
357-
<path>
358-
<groupId>org.mapstruct</groupId>
359-
<artifactId>mapstruct-processor</artifactId>
360-
<version>${org.mapstruct.version}</version>
361-
</path>
362-
</annotationProcessorPaths>
363-
<forceJavacCompilerUse>true</forceJavacCompilerUse>
364-
</configuration>
365-
</plugin>
366-
<plugin>
367-
<groupId>org.apache.maven.plugins</groupId>
368-
<artifactId>maven-surefire-plugin</artifactId>
369-
<version>${maven-surefire-plugin.version}</version>
370-
<executions>
371-
<execution>
372-
<id>default-test</id>
373-
<!-- Only run tests in the `test` phase, avoid running
374-
in the `package` phase. -->
375-
<phase>${maven-surefire-phase}</phase>
376-
</execution>
377-
</executions>
378-
</plugin>
379245
<plugin>
380246
<groupId>org.springframework.boot</groupId>
381247
<artifactId>spring-boot-maven-plugin</artifactId>
@@ -584,7 +450,6 @@
584450
<plugin>
585451
<groupId>org.owasp</groupId>
586452
<artifactId>dependency-check-maven</artifactId>
587-
<version>${owasp-dependency-check-plugin.version}</version>
588453
<executions>
589454
<execution>
590455
<goals>

‎java/sonar-project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ sonar.java.libraries=.m2
2727
sonar.junit.reportPaths=target/surefire-reports
2828
sonar.coverage.jacoco.xmlReportPaths=target/site/jacoco/jacoco.xml
2929
sonar.language=java
30-
sonar.java.source=11
30+
sonar.java.source=17
3131

3232
sonar.cpd.exclusions=**/model/*
3333
sonar.coverage.exclusions=**/AuthControllerImpl*,**/ApplicationConfig*

0 commit comments

Comments
 (0)