Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
and add Formatter and license header for 2019
  • Loading branch information
derjust committed Jun 21, 2019
1 parent 6014a60 commit a7388f2
Show file tree
Hide file tree
Showing 227 changed files with 348 additions and 277 deletions.
2 changes: 1 addition & 1 deletion .travis.settings.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright © 2018 spring-data-dynamodb-parent (https://github.com/derjust/spring-data-dynamodb)
Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ More sample code can be found in the [spring-data-dynamodb-examples](spring-data
Advanced topics can be found in the [wiki](https://github.com/derjust/spring-data-dynamodb/wiki).


## Version & Spring Framework compatibility ##
## Version & Spring Framework compatibility

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

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

`compile` and `runtime` dependencies are kept to a minimum to allow easy integartion, for example into
Expand Down
12 changes: 12 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,18 @@ mvn formatter:format
mvn license:format
```

## Check for updated dependency versions

```
mvn versions:display-dependency-updates
```

## Check for updated plugin versions

```
mvn versions:display-plugin-updates
```

# Release process

1. Check `pom.xml` for the proper `<version />` tag
Expand Down
121 changes: 79 additions & 42 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright © 2018 spring-data-dynamodb-parent (https://github.com/derjust/spring-data-dynamodb)
Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -23,7 +23,7 @@
<packaging>pom</packaging>
<version>5.1.1-SNAPSHOT</version>
<name>Spring Data DynamoDB Parent</name>
<inceptionYear>2018</inceptionYear>
<inceptionYear>2013</inceptionYear>

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

<properties>
<spring.version>5.1.2.RELEASE</spring.version>
<spring-data.version>2.1.2.RELEASE</spring-data.version>
<spring-boot.version>2.0.3.RELEASE</spring-boot.version>
<spring.version>5.1.6.RELEASE</spring.version>
<spring-data.version>2.1.8.RELEASE</spring-data.version>
<spring-boot.version>2.1.4.RELEASE</spring-boot.version>

<hibernate-validator.version>6.0.9.Final</hibernate-validator.version>
<aws-java-sdk.version>1.11.515</aws-java-sdk.version>
<aws-java-sdk.version>1.11.551</aws-java-sdk.version>
<junit.version>4.12</junit.version>
<mockito.version>2.23.0</mockito.version>
<cdi.version>1.2</cdi.version>
Expand Down Expand Up @@ -145,31 +145,45 @@
<build>
<pluginManagement>
<plugins>


<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-java</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireJavaVersion>
<version>1.8.0</version>
</requireJavaVersion>
</rules>
</configuration>
</execution>
</executions>
<version>3.0.0-M2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.0.0-M1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.0.0-M1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.7.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<version>3.1.2</version>
<configuration>
<archive>
<manifest>
Expand All @@ -185,11 +199,11 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.10</version>
<version>3.0.0</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<version>3.8.1</version>
<configuration>
<compilerArgs>
<compilerArg>-Xlint:unchecked</compilerArg>
Expand All @@ -200,10 +214,10 @@
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<version>2.7.2</version>
<version>2.9.0</version>
<configuration>
<lineEnding>LF</lineEnding>
<configFile>${project.basedir}/eclipse-formatter-config.xml</configFile>
<configFile>../src/eclipse-java-google-style.xml</configFile>
</configuration>
<executions>
<execution>
Expand All @@ -218,7 +232,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<version>3.0.0</version>
<executions>
<execution>
<id>verify-style</id>
Expand All @@ -236,7 +250,7 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>3.1.5</version>
<version>3.1.11</version>
<configuration>
<effort>Max</effort>
<!-- Reports all bugs (other values are medium and max) -->
Expand All @@ -261,8 +275,9 @@
<configuration>
<header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header>
<properties>
<owner>${project.artifactId}</owner>
<owner>spring-data-dynamodb</owner>
<email>${project.url}</email>
<project.inceptionYear>2013-2019</project.inceptionYear>
</properties>
<excludes>
<exclude>**/README.md</exclude>
Expand All @@ -288,6 +303,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version>
<executions>
<execution>
<!-- Prepare SQLite for in-memory DynamoDB instance (Unit testing) -->
Expand All @@ -314,7 +330,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.20.1</version>
<version>3.0.0-M3</version>
<configuration>
<systemProperties>
<property>
Expand All @@ -327,7 +343,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.19</version>
<version>3.0.0-M3</version>
<configuration>
<systemPropertyVariables>
<sqlite4java.library.path>${project.build.directory}/lib</sqlite4java.library.path>
Expand All @@ -348,10 +364,33 @@

</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<banDuplicatePomDependencyVersions/>
<requireMavenVersion>
<version>3.3.9</version>
</requireMavenVersion>
<requireJavaVersion>
<version>1.8.0</version>
</requireJavaVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.7</version>
<version>1.6.8</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
Expand All @@ -362,7 +401,6 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.9</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -577,7 +615,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -590,7 +628,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand All @@ -604,7 +642,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.7</version>
<configuration>
<!-- Deactivate as Github plugin controls the upload -->
<skipDeploy>true</skipDeploy>
Expand Down Expand Up @@ -748,7 +785,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.9</version>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -791,12 +828,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.3</version>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.9.0</version>
<version>3.12.0</version>
<configuration>
<linkXRef>true</linkXRef>
<analysisCache>false</analysisCache>
Expand All @@ -810,7 +847,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.20.1</version>
<version>3.0.0-M3</version>
<configuration>
</configuration>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion spring-data-dynamodb-boot/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright © 2018 spring-data-dynamodb-boot (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-boot)
Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-boot)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion spring-data-dynamodb-cdi/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright © 2018 spring-data-dynamodb-cdi (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-cdi)
Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-cdi)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions spring-data-dynamodb-examples/custom/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -24,7 +24,7 @@
<groupId>com.github.derjust</groupId>
<artifactId>spring-data-dynamodb-examples</artifactId>
<version>5.1.1-SNAPSHOT</version>
<relativePath />
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>spring-data-dynamodb-examples-custom</artifactId>
<name>Spring Data DynamoDB Custom Example</name>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
* Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
* Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
* Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
* Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
* Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Loading

0 comments on commit a7388f2

Please sign in to comment.