Skip to content

Commit 17fd8a6

Browse files
JaidenAshmoreJaidenAshmore
authored
Merge pull request #143 from JaidenAshmore/142_dependencies_bump
refs #142: Bumps all the dependencies to the later versions
2 parents e0a4943 + 56c5bd3 commit 17fd8a6

File tree

32 files changed

+101
-219
lines changed

32 files changed

+101
-219
lines changed

‎README.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,12 @@ The framework relies on the following dependencies and therefore it is recommend
4444
for compatibility.
4545
- [Core Framework](java-dynamic-sqs-listener-core)
4646
- JDK 1.8 or higher
47-
- [AWS SQS SDK](https://docs.aws.amazon.com/sdk-for-java/v2/developer-guide/welcome.html): 2.5.69
48-
- [Guava](https://github.com/google/guava): 28.0-jre
49-
- [Jackson Databind](https://github.com/FasterXML/jackson-databind): 2.9.9
47+
- [AWS SQS SDK](https://docs.aws.amazon.com/sdk-for-java/v2/developer-guide/welcome.html): 2.12.0
48+
- [Guava](https://github.com/google/guava): 29.0-jre
49+
- [Jackson Databind](https://github.com/FasterXML/jackson-databind): 2.9.10.3
5050
- [Spring Framework](java-dynamic-sqs-listener-spring)
5151
- All of the core dependencies
52-
- [Spring](https://github.com/spring-projects/spring-framework): 5.1.8.RELEASE
53-
- [Spring Boot](https://github.com/spring-projects/spring-boot): 2.1.6.RELEASE
52+
- [Spring Boot](https://github.com/spring-projects/spring-boot): 2.2.5.RELEAS
5453

5554
## Spring Quick Guide
5655
The following provides some examples using the Spring Starter for this library. *Note that this library is not Spring specific as the main implementations are

‎configuration/checkstyle/MODIFICATIONS.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ have made are:
66
- Tab width doubled from 2 spaces to 4 spaces
77
- Removed the requirement for constructor JavaDoc by adding JavadocMethod.tokens without CTOR_DEF
88
- Made unused imports a checkstyle error
9+
- Allowed for suppression annotations
10+
- Fixed up when upgrading Checkstyle Maven Plugin

‎configuration/checkstyle/google_6_18_checkstyle.xml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
-->
1414

1515
<module name="Checker">
16+
<module name="SuppressWarningsFilter"/>
1617
<property name="charset" value="UTF-8"/>
1718

1819
<property name="severity" value="warning"/>
@@ -24,7 +25,13 @@
2425
<property name="eachLine" value="true"/>
2526
</module>
2627

28+
<module name="LineLength">
29+
<property name="max" value="160"/>
30+
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
31+
</module>
32+
2733
<module name="TreeWalker">
34+
<module name="SuppressWarningsHolder"/>
2835
<module name="OuterTypeFilename"/>
2936
<module name="IllegalTokenText">
3037
<property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
@@ -37,10 +44,6 @@
3744
<property name="allowByTailComment" value="true"/>
3845
<property name="allowNonPrintableEscapes" value="true"/>
3946
</module>
40-
<module name="LineLength">
41-
<property name="max" value="160"/>
42-
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
43-
</module>
4447
<module name="AvoidStarImport"/>
4548
<module name="OneTopLevelClass"/>
4649
<module name="NoLineWrap"/>
@@ -49,9 +52,7 @@
4952
<property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
5053
</module>
5154
<module name="NeedBraces"/>
52-
<module name="LeftCurly">
53-
<property name="maxLineLength" value="160"/>
54-
</module>
55+
<module name="LeftCurly"/>
5556
<module name="RightCurly"/>
5657
<module name="RightCurly">
5758
<property name="option" value="alone"/>
@@ -191,11 +192,8 @@
191192
<module name="JavadocMethod">
192193
<property name="scope" value="public"/>
193194
<property name="allowMissingParamTags" value="true"/>
194-
<property name="allowMissingThrowsTags" value="true"/>
195195
<property name="allowMissingReturnTag" value="true"/>
196-
<property name="minLineCount" value="2"/>
197196
<property name="allowedAnnotations" value="Override, Test"/>
198-
<property name="allowThrowsTagsForSubclasses" value="true"/>
199197
<property name="tokens" value="METHOD_DEF,ANNOTATION_FIELD_DEF"/>
200198
</module>
201199
<module name="MethodName">

‎examples/core-examples/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@
3535

3636
<dependency>
3737
<groupId>org.elasticmq</groupId>
38-
<artifactId>elasticmq-rest-sqs_2.11</artifactId>
39-
<version>${elasticmq.version}</version>
38+
<artifactId>elasticmq-rest-sqs_2.12</artifactId>
4039
</dependency>
4140

4241
<dependency>

‎examples/spring-aws-example/pom.xml‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@
2121
<dependency>
2222
<groupId>org.springframework.boot</groupId>
2323
<artifactId>spring-boot-starter</artifactId>
24-
<version>${spring.boot.version}</version>
25-
</dependency>
26-
27-
<dependency>
28-
<groupId>org.springframework.boot</groupId>
29-
<artifactId>spring-boot-starter-web</artifactId>
30-
<version>${spring.boot.version}</version>
3124
</dependency>
3225

3326
<dependency>
@@ -44,7 +37,7 @@
4437

4538
<dependency>
4639
<groupId>org.elasticmq</groupId>
47-
<artifactId>elasticmq-rest-sqs_2.11</artifactId>
40+
<artifactId>elasticmq-rest-sqs_2.12</artifactId>
4841
</dependency>
4942

5043
<dependency>
@@ -54,18 +47,6 @@
5447
</dependency>
5548
</dependencies>
5649

57-
<dependencyManagement>
58-
<dependencies>
59-
<dependency>
60-
<groupId>org.springframework.boot</groupId>
61-
<artifactId>spring-boot-dependencies</artifactId>
62-
<version>${spring.boot.version}</version>
63-
<type>pom</type>
64-
<scope>import</scope>
65-
</dependency>
66-
</dependencies>
67-
</dependencyManagement>
68-
6950
<build>
7051
<resources>
7152
<resource>

‎examples/spring-integration-test-example/pom.xml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@
2323
<version>${spring.boot.version}</version>
2424
</dependency>
2525

26-
<dependency>
27-
<groupId>org.springframework.boot</groupId>
28-
<artifactId>spring-boot-starter-web</artifactId>
29-
<version>${spring.boot.version}</version>
30-
</dependency>
31-
3226
<dependency>
3327
<groupId>com.jashmore</groupId>
3428
<artifactId>java-dynamic-sqs-listener-spring-starter</artifactId>
@@ -44,14 +38,12 @@
4438
<dependency>
4539
<groupId>org.springframework</groupId>
4640
<artifactId>spring-test</artifactId>
47-
<version>${spring.version}</version>
4841
<scope>test</scope>
4942
</dependency>
5043

5144
<dependency>
5245
<groupId>org.springframework.boot</groupId>
5346
<artifactId>spring-boot-test</artifactId>
54-
<version>${spring.boot.version}</version>
5547
<scope>test</scope>
5648
</dependency>
5749

@@ -64,7 +56,7 @@
6456
<!-- Dependencies needed for creating the local SQS queue -->
6557
<dependency>
6658
<groupId>org.elasticmq</groupId>
67-
<artifactId>elasticmq-rest-sqs_2.11</artifactId>
59+
<artifactId>elasticmq-rest-sqs_2.12</artifactId>
6860
<scope>test</scope>
6961
</dependency>
7062

‎examples/spring-integration-test-example/src/test/java/it/com/jashmore/sqs/examples/integrationtests/SqsListenerExampleJunit4IntegrationTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import static org.mockito.Mockito.doAnswer;
77
import static org.mockito.Mockito.times;
88
import static org.mockito.Mockito.verify;
9-
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
109

1110
import com.google.common.collect.ImmutableList;
1211

@@ -36,7 +35,7 @@
3635
@SpringBootTest(classes = {
3736
IntegrationTestExampleApplication.class,
3837
SqsListenerExampleJunit4IntegrationTest.TestConfiguration.class
39-
}, webEnvironment = RANDOM_PORT)
38+
})
4039
@RunWith(SpringRunner.class)
4140
@TestPropertySource(properties = {"sqs.queues.integrationTestingQueue=" + QUEUE_NAME})
4241
public class SqsListenerExampleJunit4IntegrationTest {

‎examples/spring-integration-test-example/src/test/java/it/com/jashmore/sqs/examples/integrationtests/SqsListenerExampleJunit5IntegrationTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import static org.mockito.Mockito.doAnswer;
77
import static org.mockito.Mockito.times;
88
import static org.mockito.Mockito.verify;
9-
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
109

1110
import com.google.common.collect.ImmutableList;
1211

@@ -34,7 +33,7 @@
3433
@SpringBootTest(classes = {
3534
IntegrationTestExampleApplication.class,
3635
SqsListenerExampleJunit5IntegrationTest.TestConfiguration.class
37-
}, webEnvironment = RANDOM_PORT)
36+
})
3837
@ExtendWith(SpringExtension.class)
3938
@TestPropertySource(properties = {"sqs.queues.integrationTestingQueue=" + QUEUE_NAME})
4039
class SqsListenerExampleJunit5IntegrationTest {

‎examples/spring-multiple-aws-account-example/pom.xml‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@
2020
<dependency>
2121
<groupId>org.springframework.boot</groupId>
2222
<artifactId>spring-boot-starter</artifactId>
23-
<version>${spring.boot.version}</version>
24-
</dependency>
25-
26-
<dependency>
27-
<groupId>org.springframework.boot</groupId>
28-
<artifactId>spring-boot-starter-web</artifactId>
29-
<version>${spring.boot.version}</version>
3023
</dependency>
3124

3225
<dependency>
@@ -49,22 +42,10 @@
4942

5043
<dependency>
5144
<groupId>org.elasticmq</groupId>
52-
<artifactId>elasticmq-rest-sqs_2.11</artifactId>
45+
<artifactId>elasticmq-rest-sqs_2.12</artifactId>
5346
</dependency>
5447
</dependencies>
5548

56-
<dependencyManagement>
57-
<dependencies>
58-
<dependency>
59-
<groupId>org.springframework.boot</groupId>
60-
<artifactId>spring-boot-dependencies</artifactId>
61-
<version>${spring.boot.version}</version>
62-
<type>pom</type>
63-
<scope>import</scope>
64-
</dependency>
65-
</dependencies>
66-
</dependencyManagement>
67-
6849
<build>
6950
<resources>
7051
<resource>

‎examples/spring-starter-examples/pom.xml‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@
2020
<dependency>
2121
<groupId>org.springframework.boot</groupId>
2222
<artifactId>spring-boot-starter</artifactId>
23-
<version>${spring.boot.version}</version>
24-
</dependency>
25-
26-
<dependency>
27-
<groupId>org.springframework.boot</groupId>
28-
<artifactId>spring-boot-starter-web</artifactId>
29-
<version>${spring.boot.version}</version>
3023
</dependency>
3124

3225
<dependency>
@@ -43,7 +36,7 @@
4336

4437
<dependency>
4538
<groupId>org.elasticmq</groupId>
46-
<artifactId>elasticmq-rest-sqs_2.11</artifactId>
39+
<artifactId>elasticmq-rest-sqs_2.12</artifactId>
4740
</dependency>
4841

4942
<dependency>
@@ -53,18 +46,6 @@
5346
</dependency>
5447
</dependencies>
5548

56-
<dependencyManagement>
57-
<dependencies>
58-
<dependency>
59-
<groupId>org.springframework.boot</groupId>
60-
<artifactId>spring-boot-dependencies</artifactId>
61-
<version>${spring.boot.version}</version>
62-
<type>pom</type>
63-
<scope>import</scope>
64-
</dependency>
65-
</dependencies>
66-
</dependencyManagement>
67-
6849
<build>
6950
<resources>
7051
<resource>

0 commit comments

Comments
 (0)