Skip to content

Commit be25e2d

Browse files
andytaelandytael
committed
Initial commit for upgrades
1 parent 7072df3 commit be25e2d

File tree

24 files changed

+127
-53
lines changed

24 files changed

+127
-53
lines changed

‎.gitignore

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,46 @@
1-
# Copyright (c) 2023, Oracle and/or its affiliates.
1+
# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
33

4+
.DS_Store
5+
**/*.rpm
6+
**/*.jar
7+
**/*.bin
8+
*.patch
9+
env.sh
10+
labs/.DS_Store
11+
12+
.idea/**
13+
14+
### STS ###
15+
.apt_generated
16+
.classpath
17+
.factorypath
18+
.project
19+
.settings
20+
.springBeans
21+
.sts4-cache
22+
23+
### IntelliJ IDEA ###
24+
.idea
25+
*.iws
26+
*.iml
27+
*.ipr
28+
.idea/**
29+
30+
### NetBeans ###
31+
/nbproject/private/
32+
/nbbuild/
33+
/dist/
34+
/nbdist/
35+
/.nb-gradle/
36+
build/
37+
!**/src/main/**/build/
38+
!**/src/test/**/build/
39+
40+
### VS Code ###
41+
.vscode/
42+
/.jpb/**
43+
444
*.iml
545
*.ipr
646
*.iws

‎pom.xml

Lines changed: 45 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -62,24 +62,24 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
6262

6363
<properties>
6464
<spring-cloud-oci-dependencies.version>${project.version}</spring-cloud-oci-dependencies.version>
65-
<spring-cloud-dependencies.version>2022.0.4</spring-cloud-dependencies.version>
66-
<spring-boot-dependencies.version>3.1.2</spring-boot-dependencies.version>
67-
<oci-sdk.version>3.24.0</oci-sdk.version>
68-
<spring-boot-maven-plugin.version>3.1.2</spring-boot-maven-plugin.version>
69-
<maven.compiler.source>17</maven.compiler.source>
70-
<maven.compiler.target>17</maven.compiler.target>
71-
<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
72-
<maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
73-
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
74-
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
75-
<springdoc-openapi-ui.version>1.6.13</springdoc-openapi-ui.version>
76-
<commons-lang3.version>3.12.0</commons-lang3.version>
77-
<lombok.version>1.18.20</lombok.version>
78-
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
79-
<slf4j-simple.version>1.7.33</slf4j-simple.version>
80-
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
65+
<spring-cloud-dependencies.version>2023.0.1</spring-cloud-dependencies.version>
66+
<spring-boot-dependencies.version>3.2.5</spring-boot-dependencies.version>
67+
<oci-sdk.version>3.41.1</oci-sdk.version>
68+
<spring-boot-maven-plugin.version>3.2.5</spring-boot-maven-plugin.version>
69+
<maven.compiler.source>21</maven.compiler.source>
70+
<maven.compiler.target>21</maven.compiler.target>
71+
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
72+
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
73+
<maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>
74+
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
75+
<springdoc-openapi-ui.version>1.8.0</springdoc-openapi-ui.version>
76+
<commons-lang3.version>3.14.0</commons-lang3.version>
77+
<lombok.version>1.18.32</lombok.version>
78+
<javax.servlet-api.version>4.0.1</javax.servlet-api.version>
79+
<slf4j-simple.version>2.0.13</slf4j-simple.version>
80+
<flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
8181
<checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
82-
<jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
82+
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
8383
<cc.code-coverage-ratio>0.90</cc.code-coverage-ratio>
8484
<!--<dependency-check-maven.version>8.4.0</dependency-check-maven.version>
8585
<failBuildOnCVSS.score>8</failBuildOnCVSS.score> -->
@@ -101,8 +101,8 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
101101
</dependency>
102102
<dependency>
103103
<groupId>org.springdoc</groupId>
104-
<artifactId>springdoc-openapi-ui</artifactId>
105-
<version>${springdoc-openapi-ui.version}</version>
104+
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
105+
<version>2.5.0</version>
106106
</dependency>
107107

108108
<dependency>
@@ -117,9 +117,9 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
117117
<scope>test</scope>
118118
</dependency>
119119
<dependency>
120-
<groupId>javax.servlet</groupId>
121-
<artifactId>javax.servlet-api</artifactId>
122-
<version>${javax.servlet-api.version}</version>
120+
<groupId>jakarta.servlet</groupId>
121+
<artifactId>jakarta.servlet-api</artifactId>
122+
<version>6.0.0</version>
123123
<scope>provided</scope>
124124
</dependency>
125125
<dependency>
@@ -183,6 +183,29 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
183183
</pluginManagement>
184184

185185
<plugins>
186+
<!-- OpenRewrite Plugin
187+
Due to a bug, the build has to be executed like this:
188+
mvn -U org.openrewrite.maven:rewrite-maven-plugin:dryRun \
189+
-Drewrite.recipeArtifactCoordinates=org.openrewrite.recipe:rewrite-spring:RELEASE \
190+
-Drewrite.activeRecipes=org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2
191+
-->
192+
<plugin>
193+
<groupId>org.openrewrite.maven</groupId>
194+
<artifactId>rewrite-maven-plugin</artifactId>
195+
<version>5.30.0</version>
196+
<configuration>
197+
<activeRecipes>
198+
<recipe>org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2</recipe>
199+
</activeRecipes>
200+
</configuration>
201+
<dependencies>
202+
<dependency>
203+
<groupId>org.openrewrite.recipe</groupId>
204+
<artifactId>rewrite-spring</artifactId>
205+
<version>5.9.0</version>
206+
</dependency>
207+
</dependencies>
208+
</plugin>
186209
<plugin>
187210
<groupId>org.apache.maven.plugins</groupId>
188211
<artifactId>maven-javadoc-plugin</artifactId>

‎spring-cloud-oci-autoconfigure/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
4242
</scm>
4343

4444
<properties>
45-
<maven.compiler.source>17</maven.compiler.source>
46-
<maven.compiler.target>17</maven.compiler.target>
45+
<maven.compiler.source>21</maven.compiler.source>
46+
<maven.compiler.target>21</maven.compiler.target>
4747
</properties>
4848
<dependencies>
4949
<dependency>

‎spring-cloud-oci-core/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
4141
</scm>
4242

4343
<properties>
44-
<maven.compiler.source>17</maven.compiler.source>
45-
<maven.compiler.target>17</maven.compiler.target>
44+
<maven.compiler.source>21</maven.compiler.source>
45+
<maven.compiler.target>21</maven.compiler.target>
4646
</properties>
4747
<dependencies>
4848
<dependency>

‎spring-cloud-oci-core/src/main/java/com/oracle/cloud/spring/core/region/StaticRegionProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public StaticRegionProvider(String regionName) {
2121
try {
2222
region = Region.valueOf(regionName);
2323
} catch (IllegalArgumentException e) {
24-
throw new IllegalArgumentException(String.format(INVALID_REGION_MSG, regionName), e);
24+
throw new IllegalArgumentException(INVALID_REGION_MSG.formatted(regionName), e);
2525
}
2626
}
2727

‎spring-cloud-oci-core/src/test/java/com/oracle/cloud/spring/core/region/RegionProviderTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ void testInvalidRegion(){
2020

2121
String actualMessage = exception.getMessage();
2222

23-
assertEquals(actualMessage, String.format(StaticRegionProvider.INVALID_REGION_MSG, region));
23+
assertEquals(actualMessage, StaticRegionProvider.INVALID_REGION_MSG.formatted(region));
2424
}
2525

2626
@Test

‎spring-cloud-oci-core/src/test/java/com/oracle/cloud/spring/core/util/OCIObjectMapperTests.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55

66
package com.oracle.cloud.spring.core.util;
77

8-
import lombok.*;
8+
import lombok.AllArgsConstructor;
9+
import lombok.Getter;
10+
import lombok.NoArgsConstructor;
11+
import lombok.ToString;
912
import org.json.JSONException;
1013
import org.json.JSONObject;
1114
import org.junit.jupiter.api.Test;

‎spring-cloud-oci-function/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
4141
</scm>
4242

4343
<properties>
44-
<maven.compiler.source>17</maven.compiler.source>
45-
<maven.compiler.target>17</maven.compiler.target>
44+
<maven.compiler.source>21</maven.compiler.source>
45+
<maven.compiler.target>21</maven.compiler.target>
4646
</properties>
4747
<dependencies>
4848
<dependency>

‎spring-cloud-oci-logging/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
4141
</scm>
4242

4343
<properties>
44-
<maven.compiler.source>17</maven.compiler.source>
45-
<maven.compiler.target>17</maven.compiler.target>
44+
<maven.compiler.source>21</maven.compiler.source>
45+
<maven.compiler.target>21</maven.compiler.target>
4646
</properties>
4747
<dependencies>
4848
<dependency>

‎spring-cloud-oci-notification/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
4141
</scm>
4242

4343
<properties>
44-
<maven.compiler.source>17</maven.compiler.source>
45-
<maven.compiler.target>17</maven.compiler.target>
44+
<maven.compiler.source>21</maven.compiler.source>
45+
<maven.compiler.target>21</maven.compiler.target>
4646
</properties>
4747
<dependencies>
4848
<dependency>

0 commit comments

Comments
 (0)