Skip to content

Commit 5f921e6

Browse files
programenthprogramenth
authored
Merge branch 'eugenp:master' into spring-web-test1
2 parents 031ee8a + b152614 commit 5f921e6

File tree

309 files changed

+8197
-760
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

309 files changed

+8197
-760
lines changed

‎aws-modules/amazon-athena/pom.xml‎

Lines changed: 82 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,90 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
5-
<modelVersion>4.0.0</modelVersion>
6-
<artifactId>amazon-athena</artifactId>
7-
<version>0.0.1</version>
8-
<packaging>jar</packaging>
9-
<name>amazon-athena</name>
10-
<description>codebase demonstrating the integration of Amazon Athena in Spring Boot to query data stored in a S3 bucket</description>
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<artifactId>amazon-athena</artifactId>
7+
<version>0.0.1</version>
8+
<packaging>jar</packaging>
9+
<name>amazon-athena</name>
10+
<description>codebase demonstrating the integration of Amazon Athena in Spring Boot to query data stored in a S3 bucket</description>
1111

12-
<parent>
13-
<groupId>com.baeldung</groupId>
14-
<artifactId>parent-boot-3</artifactId>
15-
<version>0.0.1-SNAPSHOT</version>
16-
<relativePath>../../parent-boot-3</relativePath>
17-
</parent>
12+
<parent>
13+
<groupId>com.baeldung</groupId>
14+
<artifactId>aws-modules</artifactId>
15+
<version>1.0.0-SNAPSHOT</version>
16+
</parent>
1817

19-
<dependencies>
20-
<dependency>
21-
<groupId>org.springframework.boot</groupId>
22-
<artifactId>spring-boot-starter-web</artifactId>
23-
</dependency>
24-
<dependency>
25-
<groupId>org.springframework.boot</groupId>
26-
<artifactId>spring-boot-starter-validation</artifactId>
27-
</dependency>
28-
<dependency>
29-
<groupId>org.springframework.boot</groupId>
30-
<artifactId>spring-boot-configuration-processor</artifactId>
31-
</dependency>
32-
<dependency>
33-
<groupId>software.amazon.awssdk</groupId>
34-
<artifactId>athena</artifactId>
35-
<version>${amazon-athena.version}</version>
36-
</dependency>
37-
<dependency>
38-
<groupId>commons-io</groupId>
39-
<artifactId>commons-io</artifactId>
40-
<version>${commons-io.version}</version>
41-
</dependency>
42-
<dependency>
43-
<groupId>org.json</groupId>
44-
<artifactId>json</artifactId>
45-
<version>${org-json.version}</version>
46-
</dependency>
47-
<dependency>
48-
<groupId>com.fasterxml.jackson.datatype</groupId>
49-
<artifactId>jackson-datatype-json-org</artifactId>
50-
</dependency>
51-
<dependency>
52-
<groupId>org.projectlombok</groupId>
53-
<artifactId>lombok</artifactId>
54-
<optional>true</optional>
55-
</dependency>
56-
</dependencies>
18+
<dependencyManagement>
19+
<dependencies>
20+
<dependency>
21+
<groupId>org.springframework.boot</groupId>
22+
<artifactId>spring-boot-dependencies</artifactId>
23+
<version>${spring-boot.version}</version>
24+
<type>pom</type>
25+
<scope>import</scope>
26+
</dependency>
27+
</dependencies>
28+
</dependencyManagement>
5729

58-
<build>
59-
<plugins>
60-
<plugin>
61-
<groupId>org.springframework.boot</groupId>
62-
<artifactId>spring-boot-maven-plugin</artifactId>
63-
<configuration>
64-
<excludes>
65-
<exclude>
66-
<groupId>org.projectlombok</groupId>
67-
<artifactId>lombok</artifactId>
68-
</exclude>
69-
</excludes>
70-
</configuration>
71-
</plugin>
72-
</plugins>
73-
</build>
30+
<dependencies>
31+
<dependency>
32+
<groupId>org.springframework.boot</groupId>
33+
<artifactId>spring-boot-starter-web</artifactId>
34+
</dependency>
35+
<dependency>
36+
<groupId>org.springframework.boot</groupId>
37+
<artifactId>spring-boot-starter-validation</artifactId>
38+
</dependency>
39+
<dependency>
40+
<groupId>org.springframework.boot</groupId>
41+
<artifactId>spring-boot-configuration-processor</artifactId>
42+
</dependency>
43+
<dependency>
44+
<groupId>software.amazon.awssdk</groupId>
45+
<artifactId>athena</artifactId>
46+
</dependency>
47+
<dependency>
48+
<groupId>commons-io</groupId>
49+
<artifactId>commons-io</artifactId>
50+
<version>${commons-io.version}</version>
51+
</dependency>
52+
<dependency>
53+
<groupId>org.json</groupId>
54+
<artifactId>json</artifactId>
55+
<version>${org-json.version}</version>
56+
</dependency>
57+
<dependency>
58+
<groupId>com.fasterxml.jackson.datatype</groupId>
59+
<artifactId>jackson-datatype-json-org</artifactId>
60+
</dependency>
61+
<dependency>
62+
<groupId>org.projectlombok</groupId>
63+
<artifactId>lombok</artifactId>
64+
<optional>true</optional>
65+
</dependency>
66+
</dependencies>
7467

75-
<properties>
76-
<org-json.version>20240303</org-json.version>
77-
<commons-io.version>2.16.1</commons-io.version>
78-
<amazon-athena.version>2.26.0</amazon-athena.version>
79-
</properties>
68+
<build>
69+
<plugins>
70+
<plugin>
71+
<groupId>org.springframework.boot</groupId>
72+
<artifactId>spring-boot-maven-plugin</artifactId>
73+
<configuration>
74+
<excludes>
75+
<exclude>
76+
<groupId>org.projectlombok</groupId>
77+
<artifactId>lombok</artifactId>
78+
</exclude>
79+
</excludes>
80+
</configuration>
81+
</plugin>
82+
</plugins>
83+
</build>
84+
85+
<properties>
86+
<org-json.version>20240303</org-json.version>
87+
<commons-io.version>2.16.1</commons-io.version>
88+
</properties>
8089

8190
</project>

‎aws-modules/amazon-textract/pom.xml‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,22 @@
1111

1212
<parent>
1313
<groupId>com.baeldung</groupId>
14-
<artifactId>parent-boot-3</artifactId>
15-
<version>0.0.1-SNAPSHOT</version>
16-
<relativePath>../../parent-boot-3</relativePath>
14+
<artifactId>aws-modules</artifactId>
15+
<version>1.0.0-SNAPSHOT</version>
1716
</parent>
1817

18+
<dependencyManagement>
19+
<dependencies>
20+
<dependency>
21+
<groupId>org.springframework.boot</groupId>
22+
<artifactId>spring-boot-dependencies</artifactId>
23+
<version>${spring-boot.version}</version>
24+
<type>pom</type>
25+
<scope>import</scope>
26+
</dependency>
27+
</dependencies>
28+
</dependencyManagement>
29+
1930
<dependencies>
2031
<dependency>
2132
<groupId>org.springframework.boot</groupId>
@@ -29,15 +40,14 @@
2940
<groupId>org.springframework.boot</groupId>
3041
<artifactId>spring-boot-configuration-processor</artifactId>
3142
</dependency>
43+
<dependency>
44+
<groupId>org.springframework.boot</groupId>
45+
<artifactId>spring-boot-starter-test</artifactId>
46+
</dependency>
3247
<dependency>
3348
<groupId>software.amazon.awssdk</groupId>
3449
<artifactId>textract</artifactId>
35-
<version>${amazon-textract.version}</version>
3650
</dependency>
3751
</dependencies>
3852

39-
<properties>
40-
<amazon-textract.version>2.27.5</amazon-textract.version>
41-
</properties>
42-
4353
</project>

‎aws-modules/aws-app-sync/pom.xml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,20 @@
99

1010
<parent>
1111
<groupId>com.baeldung</groupId>
12-
<artifactId>parent-boot-2</artifactId>
13-
<version>0.0.1-SNAPSHOT</version>
14-
<relativePath>../../parent-boot-2</relativePath>
12+
<artifactId>aws-modules</artifactId>
13+
<version>1.0.0-SNAPSHOT</version>
1514
</parent>
1615

1716
<dependencies>
1817
<dependency>
1918
<groupId>org.springframework.boot</groupId>
2019
<artifactId>spring-boot-starter-web</artifactId>
20+
<version>${spring-boot.version}</version>
2121
</dependency>
2222
<dependency>
2323
<groupId>org.springframework.boot</groupId>
2424
<artifactId>spring-boot-starter-test</artifactId>
25+
<version>${spring-boot.version}</version>
2526
<scope>test</scope>
2627
<exclusions>
2728
<exclusion>
@@ -33,6 +34,7 @@
3334
<dependency>
3435
<groupId>org.springframework.boot</groupId>
3536
<artifactId>spring-boot-starter-webflux</artifactId>
37+
<version>${spring-boot.version}</version>
3638
</dependency>
3739
</dependencies>
3840

@@ -45,4 +47,8 @@
4547
</plugins>
4648
</build>
4749

50+
<properties>
51+
<spring-boot.version>3.3.2</spring-boot.version>
52+
</properties>
53+
4854
</project>

‎aws-modules/aws-dynamodb/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
</build>
6464

6565
<properties>
66+
<aws-java-sdk.version>1.12.331</aws-java-sdk.version>
6667
<gson.version>2.11.0</gson.version>
6768
<dynamodblocal.version>1.21.1</dynamodblocal.version>
6869
<maven-plugins-version>3.1.1</maven-plugins-version>

‎aws-modules/aws-s3/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<artifactId>commons-codec</artifactId>
3131
<version>${commons-codec.version}</version>
3232
</dependency>
33-
3433
<!-- Test dependencies -->
3534
<dependency>
3635
<groupId>software.amazon.awssdk</groupId>

‎aws-modules/pom.xml‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,25 @@
2727
<module>s3proxy</module>
2828
</modules>
2929

30+
<dependencyManagement>
31+
<dependencies>
32+
<dependency>
33+
<groupId>software.amazon.awssdk</groupId>
34+
<artifactId>bom</artifactId>
35+
<version>${aws-java-sdk-v2.version}</version>
36+
<type>pom</type>
37+
<scope>import</scope>
38+
</dependency>
39+
<dependency>
40+
<groupId>com.amazonaws</groupId>
41+
<artifactId>aws-java-sdk-bom</artifactId>
42+
<version>${aws-java-sdk.version}</version>
43+
<type>pom</type>
44+
<scope>import</scope>
45+
</dependency>
46+
</dependencies>
47+
</dependencyManagement>
48+
3049
<dependencies>
3150
<dependency>
3251
<groupId>com.amazonaws</groupId>
@@ -37,10 +56,11 @@
3756
</dependencies>
3857

3958
<properties>
40-
<aws-java-sdk.version>1.12.331</aws-java-sdk.version>
59+
<aws-java-sdk.version>1.12.777</aws-java-sdk.version>
4160
<aws-java-sdk-v2.version>2.24.9</aws-java-sdk-v2.version>
4261
<maven-shade-plugin.version>3.0.0</maven-shade-plugin.version>
4362
<aws-java-sdk-dynamodb.version>1.12.523</aws-java-sdk-dynamodb.version>
63+
<spring-boot.version>3.3.2</spring-boot.version>
4464
</properties>
4565

4666
</project>

‎aws-modules/s3proxy/pom.xml‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,34 @@
1111

1212
<parent>
1313
<groupId>com.baeldung</groupId>
14-
<artifactId>parent-boot-3</artifactId>
15-
<version>0.0.1-SNAPSHOT</version>
16-
<relativePath>../../parent-boot-3</relativePath>
14+
<artifactId>aws-modules</artifactId>
15+
<version>1.0.0-SNAPSHOT</version>
1716
</parent>
1817

18+
<dependencyManagement>
19+
<dependencies>
20+
<dependency>
21+
<groupId>org.springframework.boot</groupId>
22+
<artifactId>spring-boot-dependencies</artifactId>
23+
<version>${spring-boot.version}</version>
24+
<type>pom</type>
25+
<scope>import</scope>
26+
</dependency>
27+
</dependencies>
28+
</dependencyManagement>
29+
1930
<dependencies>
2031
<dependency>
2132
<groupId>org.springframework.boot</groupId>
2233
<artifactId>spring-boot-starter-web</artifactId>
2334
</dependency>
2435
<dependency>
2536
<groupId>org.springframework.boot</groupId>
26-
<artifactId>spring-boot-configuration-processor</artifactId>
37+
<artifactId>spring-boot-starter-test</artifactId>
2738
</dependency>
39+
<dependency>
40+
<groupId>org.springframework.boot</groupId>
41+
<artifactId>spring-boot-configuration-processor</artifactId></dependency>
2842
<dependency>
2943
<groupId>org.gaul</groupId>
3044
<artifactId>s3proxy</artifactId>
@@ -33,13 +47,11 @@
3347
<dependency>
3448
<groupId>software.amazon.awssdk</groupId>
3549
<artifactId>s3</artifactId>
36-
<version>${aws-sdk.version}</version>
3750
</dependency>
3851
</dependencies>
3952

4053
<properties>
4154
<s3proxy.version>2.3.0</s3proxy.version>
42-
<aws-sdk.version>2.28.23</aws-sdk.version>
4355
</properties>
4456

4557
</project>

0 commit comments

Comments
 (0)