diff options
| author |   adheli.tavares <adheli.tavares@est.tech> | 2023-08-02 14:49:33 +0100 |
|---|---|---|
| committer | adheli.tavares <adheli.tavares@est.tech> | 2023-09-22 15:46:33 +0100 |
| commit | 9b0780e59376d20ae9044575ce9921fb7e6b519f (patch) | |
| tree | 3326006358bab0e5eb9ad68a799e9997860fa9a4 /main/pom.xml | |
| parent | 535f62b4b4870505d2351ed098415d8d643b2ace (diff) | |
Java 17 / Spring 6 / Spring Boot 3 Upgrade
Issue-ID: POLICY-4670
Change-Id: Ie25d0501e5b936621e41f0d3c637320784d56627
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
Diffstat (limited to 'main/pom.xml')
| -rw-r--r-- | main/pom.xml | 55 |
1 files changed, 27 insertions, 28 deletions
diff --git a/main/pom.xml b/main/pom.xml index 893cec03..5f88ee54 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -30,11 +30,12 @@ <parent> <groupId>org.onap.policy.api</groupId> <artifactId>policy-api</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent> <artifactId>api-main</artifactId> <name>${project.artifactId}</name> <description>The main module of Policy Api that handles startup, lifecycle management, and parameters.</description> + <dependencies> <dependency> <groupId>org.onap.policy.models</groupId> @@ -47,44 +48,24 @@ <version>${policy.common.version}</version> </dependency> <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - </dependency> - <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.onap.policy.common</groupId> <artifactId>utils-test</artifactId> <version>${policy.common.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> - <scope>test</scope> - </dependency> + <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-web</artifactId> </dependency> <dependency> <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> - <!-- Exclude the default Jackson dependency --> - <exclusions> - <exclusion> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-json</artifactId> - </exclusion> - </exclusions> + <artifactId>spring-boot-starter-tomcat</artifactId> </dependency> <dependency> <groupId>org.springframework.boot</groupId> @@ -100,14 +81,30 @@ </dependency> <dependency> <groupId>org.springdoc</groupId> - <artifactId>springdoc-openapi-ui</artifactId> + <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId> </dependency> <dependency> <groupId>io.micrometer</groupId> <artifactId>micrometer-registry-prometheus</artifactId> - <version>${version.io.micrometer}</version> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-core</artifactId> + </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-junit-jupiter</artifactId> + </dependency> </dependencies> <build> <resources> @@ -153,9 +150,10 @@ </importMappings> <configOptions> <sourceFolder>src/gen/java</sourceFolder> - <dateLibrary>java11</dateLibrary> + <dateLibrary>java17</dateLibrary> <interfaceOnly>true</interfaceOnly> <useTags>true</useTags> + <jakarta>true</jakarta> </configOptions> </configuration> </execution> @@ -164,6 +162,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${version.springboot}</version> <executions> <execution> <goals> |