Skip to content

Commit d132b6b

Browse files
derjustderjust
committed
Update dependencies
and add Formatter and license header for 2019
1 parent 7cc122a commit d132b6b

File tree

227 files changed

+348
-277
lines changed

Some content is hidden

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

227 files changed

+348
-277
lines changed

‎.travis.settings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright © 2018 spring-data-dynamodb-parent (https://github.com/derjust/spring-data-dynamodb)
4+
Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ More sample code can be found in the [spring-data-dynamodb-examples](spring-data
155155
Advanced topics can be found in the [wiki](https://github.com/derjust/spring-data-dynamodb/wiki).
156156

157157

158-
## Version & Spring Framework compatibility ##
158+
## Version & Spring Framework compatibility
159159

160160
The major and minor number of this library refers to the compatible Spring framework version. The build number is used as specified by SEMVER.
161161

@@ -169,7 +169,7 @@ API changes will follow SEMVER and loosly the Spring Framework releases.
169169
| 4.4.x | >= 1.4.0 && < 2.0 | >= 4.3 && < 5.0 | Hopper-SR2 |
170170
| 4.5.x | >= 1.4.0 && < 2.0 | >= 4.3 && < 5.0 | Ingalls |
171171
| 5.0.x | >= 2.0 && < 2.1 | >= 5.0 && < 5.1 | Kay-SR1 |
172-
| 5.1.x | >= 2.1 | >= 5.1 | Lovelace-SR1 |
172+
| 5.1.x | >= 2.1 | >= 5.1 | Lovelace-SR6 |
173173
`spring-data-dynamodb` depends directly on `spring-data` as also `spring-context`, `spring-data` and `spring-tx`.
174174

175175
`compile` and `runtime` dependencies are kept to a minimum to allow easy integartion, for example into

‎RELEASE.md

+12
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,18 @@ mvn formatter:format
1212
mvn license:format
1313
```
1414

15+
## Check for updated dependency versions
16+
17+
```
18+
mvn versions:display-dependency-updates
19+
```
20+
21+
## Check for updated plugin versions
22+
23+
```
24+
mvn versions:display-plugin-updates
25+
```
26+
1527
# Release process
1628

1729
1. Check `pom.xml` for the proper `<version />` tag

‎pom.xml

+79-42
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright © 2018 spring-data-dynamodb-parent (https://github.com/derjust/spring-data-dynamodb)
4+
Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
2323
<packaging>pom</packaging>
2424
<version>5.1.1-SNAPSHOT</version>
2525
<name>Spring Data DynamoDB Parent</name>
26-
<inceptionYear>2018</inceptionYear>
26+
<inceptionYear>2013</inceptionYear>
2727

2828
<description>The primary goal of the Spring® Data project is to make it easier to build Spring-powered applications
2929
that use data access technologies.
@@ -38,12 +38,12 @@
3838
</licenses>
3939

4040
<properties>
41-
<spring.version>5.1.2.RELEASE</spring.version>
42-
<spring-data.version>2.1.2.RELEASE</spring-data.version>
43-
<spring-boot.version>2.0.3.RELEASE</spring-boot.version>
41+
<spring.version>5.1.6.RELEASE</spring.version>
42+
<spring-data.version>2.1.8.RELEASE</spring-data.version>
43+
<spring-boot.version>2.1.4.RELEASE</spring-boot.version>
4444

4545
<hibernate-validator.version>6.0.9.Final</hibernate-validator.version>
46-
<aws-java-sdk.version>1.11.515</aws-java-sdk.version>
46+
<aws-java-sdk.version>1.11.551</aws-java-sdk.version>
4747
<junit.version>4.12</junit.version>
4848
<mockito.version>2.23.0</mockito.version>
4949
<cdi.version>1.2</cdi.version>
@@ -145,31 +145,45 @@
145145
<build>
146146
<pluginManagement>
147147
<plugins>
148-
149-
148+
<plugin>
149+
<groupId>org.jacoco</groupId>
150+
<artifactId>jacoco-maven-plugin</artifactId>
151+
<version>0.8.4</version>
152+
</plugin>
150153
<plugin>
151154
<groupId>org.apache.maven.plugins</groupId>
152155
<artifactId>maven-enforcer-plugin</artifactId>
153-
<executions>
154-
<execution>
155-
<id>enforce-java</id>
156-
<goals>
157-
<goal>enforce</goal>
158-
</goals>
159-
<configuration>
160-
<rules>
161-
<requireJavaVersion>
162-
<version>1.8.0</version>
163-
</requireJavaVersion>
164-
</rules>
165-
</configuration>
166-
</execution>
167-
</executions>
156+
<version>3.0.0-M2</version>
157+
</plugin>
158+
<plugin>
159+
<groupId>org.apache.maven.plugins</groupId>
160+
<artifactId>maven-clean-plugin</artifactId>
161+
<version>3.1.0</version>
162+
</plugin>
163+
<plugin>
164+
<groupId>org.apache.maven.plugins</groupId>
165+
<artifactId>maven-deploy-plugin</artifactId>
166+
<version>3.0.0-M1</version>
167+
</plugin>
168+
<plugin>
169+
<groupId>org.apache.maven.plugins</groupId>
170+
<artifactId>maven-install-plugin</artifactId>
171+
<version>3.0.0-M1</version>
172+
</plugin>
173+
<plugin>
174+
<groupId>org.apache.maven.plugins</groupId>
175+
<artifactId>maven-resources-plugin</artifactId>
176+
<version>3.1.0</version>
177+
</plugin>
178+
<plugin>
179+
<groupId>org.apache.maven.plugins</groupId>
180+
<artifactId>maven-site-plugin</artifactId>
181+
<version>3.7.1</version>
168182
</plugin>
169183
<plugin>
170184
<groupId>org.apache.maven.plugins</groupId>
171185
<artifactId>maven-jar-plugin</artifactId>
172-
<version>3.0.2</version>
186+
<version>3.1.2</version>
173187
<configuration>
174188
<archive>
175189
<manifest>
@@ -185,11 +199,11 @@
185199
<plugin>
186200
<groupId>org.codehaus.mojo</groupId>
187201
<artifactId>build-helper-maven-plugin</artifactId>
188-
<version>1.10</version>
202+
<version>3.0.0</version>
189203
</plugin>
190204
<plugin>
191205
<artifactId>maven-compiler-plugin</artifactId>
192-
<version>3.1</version>
206+
<version>3.8.1</version>
193207
<configuration>
194208
<compilerArgs>
195209
<compilerArg>-Xlint:unchecked</compilerArg>
@@ -200,10 +214,10 @@
200214
<plugin>
201215
<groupId>net.revelc.code.formatter</groupId>
202216
<artifactId>formatter-maven-plugin</artifactId>
203-
<version>2.7.2</version>
217+
<version>2.9.0</version>
204218
<configuration>
205219
<lineEnding>LF</lineEnding>
206-
<configFile>${project.basedir}/eclipse-formatter-config.xml</configFile>
220+
<configFile>../src/eclipse-java-google-style.xml</configFile>
207221
</configuration>
208222
<executions>
209223
<execution>
@@ -218,7 +232,7 @@
218232
<plugin>
219233
<groupId>org.apache.maven.plugins</groupId>
220234
<artifactId>maven-checkstyle-plugin</artifactId>
221-
<version>2.17</version>
235+
<version>3.0.0</version>
222236
<executions>
223237
<execution>
224238
<id>verify-style</id>
@@ -236,7 +250,7 @@
236250
<plugin>
237251
<groupId>com.github.spotbugs</groupId>
238252
<artifactId>spotbugs-maven-plugin</artifactId>
239-
<version>3.1.5</version>
253+
<version>3.1.11</version>
240254
<configuration>
241255
<effort>Max</effort>
242256
<!-- Reports all bugs (other values are medium and max) -->
@@ -261,8 +275,9 @@
261275
<configuration>
262276
<header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header>
263277
<properties>
264-
<owner>${project.artifactId}</owner>
278+
<owner>spring-data-dynamodb</owner>
265279
<email>${project.url}</email>
280+
<project.inceptionYear>2013-2019</project.inceptionYear>
266281
</properties>
267282
<excludes>
268283
<exclude>**/README.md</exclude>
@@ -288,6 +303,7 @@
288303
<plugin>
289304
<groupId>org.apache.maven.plugins</groupId>
290305
<artifactId>maven-dependency-plugin</artifactId>
306+
<version>3.1.1</version>
291307
<executions>
292308
<execution>
293309
<!-- Prepare SQLite for in-memory DynamoDB instance (Unit testing) -->
@@ -314,7 +330,7 @@
314330
<plugin>
315331
<groupId>org.apache.maven.plugins</groupId>
316332
<artifactId>maven-surefire-plugin</artifactId>
317-
<version>2.20.1</version>
333+
<version>3.0.0-M3</version>
318334
<configuration>
319335
<systemProperties>
320336
<property>
@@ -327,7 +343,7 @@
327343
<plugin>
328344
<groupId>org.apache.maven.plugins</groupId>
329345
<artifactId>maven-failsafe-plugin</artifactId>
330-
<version>2.19</version>
346+
<version>3.0.0-M3</version>
331347
<configuration>
332348
<systemPropertyVariables>
333349
<sqlite4java.library.path>${project.build.directory}/lib</sqlite4java.library.path>
@@ -348,10 +364,33 @@
348364

349365
</pluginManagement>
350366
<plugins>
367+
<plugin>
368+
<groupId>org.apache.maven.plugins</groupId>
369+
<artifactId>maven-enforcer-plugin</artifactId>
370+
<executions>
371+
<execution>
372+
<id>enforce-maven</id>
373+
<goals>
374+
<goal>enforce</goal>
375+
</goals>
376+
<configuration>
377+
<rules>
378+
<banDuplicatePomDependencyVersions/>
379+
<requireMavenVersion>
380+
<version>3.3.9</version>
381+
</requireMavenVersion>
382+
<requireJavaVersion>
383+
<version>1.8.0</version>
384+
</requireJavaVersion>
385+
</rules>
386+
</configuration>
387+
</execution>
388+
</executions>
389+
</plugin>
351390
<plugin>
352391
<groupId>org.sonatype.plugins</groupId>
353392
<artifactId>nexus-staging-maven-plugin</artifactId>
354-
<version>1.6.7</version>
393+
<version>1.6.8</version>
355394
<extensions>true</extensions>
356395
<configuration>
357396
<serverId>ossrh</serverId>
@@ -362,7 +401,6 @@
362401
<plugin>
363402
<groupId>org.jacoco</groupId>
364403
<artifactId>jacoco-maven-plugin</artifactId>
365-
<version>0.7.9</version>
366404
<executions>
367405
<execution>
368406
<goals>
@@ -577,7 +615,7 @@
577615
<plugin>
578616
<groupId>org.apache.maven.plugins</groupId>
579617
<artifactId>maven-javadoc-plugin</artifactId>
580-
<version>3.0.0</version>
618+
<version>3.1.0</version>
581619
<executions>
582620
<execution>
583621
<id>attach-javadocs</id>
@@ -590,7 +628,7 @@
590628
<plugin>
591629
<groupId>org.apache.maven.plugins</groupId>
592630
<artifactId>maven-gpg-plugin</artifactId>
593-
<version>1.5</version>
631+
<version>1.6</version>
594632
<executions>
595633
<execution>
596634
<id>sign-artifacts</id>
@@ -604,7 +642,6 @@
604642
<plugin>
605643
<groupId>org.apache.maven.plugins</groupId>
606644
<artifactId>maven-site-plugin</artifactId>
607-
<version>3.7</version>
608645
<configuration>
609646
<!-- Deactivate as Github plugin controls the upload -->
610647
<skipDeploy>true</skipDeploy>
@@ -748,7 +785,7 @@
748785
<plugin>
749786
<groupId>org.apache.maven.plugins</groupId>
750787
<artifactId>maven-project-info-reports-plugin</artifactId>
751-
<version>2.9</version>
788+
<version>3.0.0</version>
752789
</plugin>
753790
<plugin>
754791
<groupId>org.apache.maven.plugins</groupId>
@@ -791,12 +828,12 @@
791828
<plugin>
792829
<groupId>org.apache.maven.plugins</groupId>
793830
<artifactId>maven-jxr-plugin</artifactId>
794-
<version>2.3</version>
831+
<version>3.0.0</version>
795832
</plugin>
796833
<plugin>
797834
<groupId>org.apache.maven.plugins</groupId>
798835
<artifactId>maven-pmd-plugin</artifactId>
799-
<version>3.9.0</version>
836+
<version>3.12.0</version>
800837
<configuration>
801838
<linkXRef>true</linkXRef>
802839
<analysisCache>false</analysisCache>
@@ -810,7 +847,7 @@
810847
<plugin>
811848
<groupId>org.apache.maven.plugins</groupId>
812849
<artifactId>maven-surefire-report-plugin</artifactId>
813-
<version>2.20.1</version>
850+
<version>3.0.0-M3</version>
814851
<configuration>
815852
</configuration>
816853
</plugin>

‎spring-data-dynamodb-boot/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright © 2018 spring-data-dynamodb-boot (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-boot)
4+
Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-boot)
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.

‎spring-data-dynamodb-cdi/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright © 2018 spring-data-dynamodb-cdi (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-cdi)
4+
Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-cdi)
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.

‎spring-data-dynamodb-examples/custom/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
4+
Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
2424
<groupId>com.github.derjust</groupId>
2525
<artifactId>spring-data-dynamodb-examples</artifactId>
2626
<version>5.1.1-SNAPSHOT</version>
27-
<relativePath />
27+
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929
<artifactId>spring-data-dynamodb-examples-custom</artifactId>
3030
<name>Spring Data DynamoDB Custom Example</name>

‎spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/Application.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
2+
* Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/CustomUserRepositoryMethods.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
2+
* Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/CustomUserRepositoryMethodsImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
2+
* Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/DynamoDBConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
2+
* Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/User.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
2+
* Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)