Skip to content

Commit ee3c2c4

Browse files
derjustderjust
committed
Merge tag 'v5.0.2' into testBackport
[maven-release-plugin] copy for tag v5.0.2
2 parents 3339da7 + 1cbab5f commit ee3c2c4

File tree

176 files changed

+541
-252
lines changed

Some content is hidden

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

176 files changed

+541
-252
lines changed

‎DONATION.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ As I'm a firm believer in OSS I nevertheless have to pay once in a while for stu
1313

1414
## Paypal
1515

16-
[![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=CWVWF9DD73J5S)
16+
[![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=CWVWF9DD73J5S)
1717

1818
## Beer
1919

‎README.md‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,22 @@
1-
[![codecov.io](https://codecov.io/github/derjust/spring-data-dynamodb/coverage.svg?branch=master)](https://codecov.io/github/derjust/spring-data-dynamodb?branch=master) [![Build Status](https://travis-ci.org/derjust/spring-data-dynamodb.svg?branch=master)](https://travis-ci.org/derjust/spring-data-dynamodb)
2-
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.derjust/spring-data-dynamodb/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.derjust/spring-data-dynamodb)
1+
[![codecov.io](https://codecov.io/github/spring-data-dynamodb/spring-data-dynamodb/coverage.svg?branch=master)](https://codecov.io/github/spring-data-dynamodb/spring-data-dynamodb?branch=master) [![Build Status](https://travis-ci.org/spring-data-dynamodb/spring-data-dynamodb.svg?branch=master)](https://travis-ci.org/spring-data-dynamodb/spring-data-dynamodb)
2+
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.spring-data-dynamodb/spring-data-dynamodb/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.spring-data-dynamodb/spring-data-dynamodb)
33
[![Donation badge](https://img.shields.io/badge/Donate-%F0%9F%92%B8-DAA520.svg)](DONATION.md)
44

5-
# ⚠ Planing to [transfer](https://help.github.com/articles/transferring-a-repository-owned-by-your-personal-account/) this repository to the [spring-data-dynamodb](https://github.com/spring-data-dynamodb) organization by the end of the month! ⚠ #
6-
Everything should stay the same for links/browsing - just Git `remote`s must be updated
7-
8-
95
# Spring Data DynamoDB #
106

11-
<img align="left" src="https://derjust.github.io/spring-data-dynamodb/banner/spring-data-dynamodb.png">
7+
<img align="left" src="https://spring-data-dynamodb.github.io/spring-data-dynamodb/banner/spring-data-dynamodb.png" />
128

139
The primary goal of the [Spring® Data](http://www.springsource.org/spring-data) project is to make it easier to build Spring-powered applications that use data access technologies.
1410

1511
This module deals with enhanced support for a data access layer built on [AWS DynamoDB](https://aws.amazon.com/dynamodb/).
1612

17-
Technical infos can be found on the [project page](https://derjust.github.io/spring-data-dynamodb/).
13+
Technical infos can be found on the [project page](https://spring-data-dynamodb.github.io/spring-data-dynamodb/).
1814

1915
## Supported Features ##
2016

2117
* Implementation of CRUD methods for DynamoDB Entities
2218
* Dynamic query generation from query method names (Only a limited number of keywords and comparison operators currently supported)
23-
* Possibility to integrate [custom repository code](https://github.com/derjust/spring-data-dynamodb/wiki/Custom-repository-implementations)
19+
* Possibility to integrate [custom repository code](https://github.com/spring-data-dynamodb/spring-data-dynamodb/wiki/Custom-repository-implementations)
2420
* Easy Spring annotation based integration
2521

2622
## Demo application ##
@@ -50,11 +46,11 @@ Spring-Boot projects.
5046

5147
## Quick Start ##
5248

53-
Download the JAR though [Maven](http://mvnrepository.com/artifact/com.github.derjust/spring-data-dynamodb):
49+
Download the JAR though [Maven Central](http://mvnrepository.com/artifact/com.github.spring-data-dynamodb/spring-data-dynamodb):
5450

5551
```xml
5652
<dependency>
57-
<groupId>com.github.derjust</groupId>
53+
<groupId>com.github.spring-data-dynamodb</groupId>
5854
<artifactId>spring-data-dynamodb</artifactId>
5955
<version>4.5.5</version>
6056
</dependency>
@@ -68,7 +64,7 @@ repositories {
6864
}
6965

7066
dependencies {
71-
compile group: 'com.github.derjust',
67+
compile group: 'com.github.spring-data-dynamodb',
7268
name: 'spring-data-dynamodb',
7369
version: '4.5.5'
7470
}
@@ -119,7 +115,7 @@ or in XML...
119115
xsi:schemaLocation="http://www.springframework.org/schema/beans
120116
http://www.springframework.org/schema/beans/spring-beans.xsd
121117
http://docs.socialsignin.org/schema/data/dynamodb
122-
http://docs.socialsignin.org/schema/data/dynamodb/spring-dynamodb.xsd">
118+
http://spring-data-dynamodb.github.io/spring-data-dynamodb/spring-dynamodb-1.0.xsd">
123119

124120
<bean id="amazonDynamoDB" class="com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient">
125121
<constructor-arg ref="amazonAWSCredentials" />
@@ -223,7 +219,7 @@ public interface UserRepository extends PagingAndSortingRepository<User, String>
223219

224220
@EnableScan
225221
@EnableScanCount
226-
public Page<User> findAll(Pageable pageable);
222+
Page<User> findAll(Pageable pageable);
227223
}
228224
```
229225

@@ -286,7 +282,17 @@ And finally write a test client
286282
}
287283
}
288284
```
289-
290-
285+
286+
## History
287+
The code base has some history already in it - let's clarify it a bit:
288+
* The code base was established under [github.com/michaellavelle/spring-data-dynamodb)](https://github.com/michaellavelle/spring-data-dynamodb)
289+
* It was forked and further maintained under [github.com/derjust/spring-data-dynamodb)](https://github.com/derjust/spring-data-dynamodb)
290+
* Available in Maven Central under [`com.github.derjust:spring-data-dynamodb`](http://central.maven.org/maven2/com/github/derjust/spring-data-dynamodb/)
291+
* Ultimately transferred to [github.com/spring-data-dynamodb/spring-data-dynamodb)](https://github.com/spring-data-dynamodb/spring-data-dynamodb)
292+
* Available in Maven Central under [`com.github.spring-data-dynamodb:spring-data-dynamodb`](http://central.maven.org/maven2/com/github/spring-data-dynamodb/spring-data-dynamodb/)
293+
294+
The Java package name/XSD namespace never changed from `org.socialsignin.spring.data.dynamodb`.
295+
But the XSD is now also available at [`https://spring-data-dynamodb.github.io/spring-data-dynamodb/spring-dynamodb-1.0.xsd`](https://spring-data-dynamodb.github.io/spring-data-dynamodb/spring-dynamodb-1.0.xsd).
296+
291297
## Advanced topics ##
292-
Advanced topics can be found in the [wiki](https://github.com/derjust/spring-data-dynamodb/wiki).
298+
Advanced topics can be found in the [wiki](https://github.com/spring-data-dynamodb/spring-data-dynamodb/wiki).

‎RELEASE.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Release process #
22

33
1. Check `pom.xml` for the proper `<version />` tag
4-
1. Check `pom.xml` SpecificaitonVersion entries
4+
1. Check `pom.xml` `<Specification-Version />` entries
55
1. Update `src/changes/changes.xml` timestamp of the release version
6-
1. Update `README.md` version for the Maven/Gradle examples
6+
1. Update `README.md` version for the Maven examples
77

88
Then execute
99

‎checkstyle.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<!--
33
4-
Copyright © 2013 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
4+
Copyright © 2018 spring-data-dynamodb (https://github.com/spring-data-dynamodb/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.

‎pom.xml‎

Lines changed: 61 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright © 2013 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
4+
Copyright © 2018 spring-data-dynamodb (https://github.com/spring-data-dynamodb/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.
@@ -18,16 +18,16 @@
1818
-->
1919
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2020
<modelVersion>4.0.0</modelVersion>
21-
<groupId>com.github.derjust</groupId>
21+
<groupId>com.github.spring-data-dynamodb</groupId>
2222
<artifactId>spring-data-dynamodb</artifactId>
2323
<version>4.5.5-SNAPSHOT</version>
2424
<name>Spring Data DynamoDB</name>
25-
<inceptionYear>2013</inceptionYear>
25+
<inceptionYear>2018</inceptionYear>
2626

2727
<description>The primary goal of the Spring® Data project is to make it easier to build Spring-powered applications
2828
that use data access technologies.
2929
This module deals with enhanced support for a data access layer built on AWS DynamoDB.</description>
30-
<url>https://github.com/derjust/spring-data-dynamodb</url>
30+
<url>https://github.com/spring-data-dynamodb/spring-data-dynamodb</url>
3131

3232
<licenses>
3333
<license>
@@ -41,7 +41,7 @@
4141
<spring-data.version>Ingalls-RELEASE</spring-data.version>
4242

4343
<hibernate-validator.version>5.2.4.Final</hibernate-validator.version>
44-
<aws-java-sdk.version>1.11.232</aws-java-sdk.version>
44+
<aws-java-sdk.version>1.11.289</aws-java-sdk.version>
4545
<junit.version>4.12</junit.version>
4646
<mockito.version>2.13.0</mockito.version>
4747

@@ -117,6 +117,18 @@
117117
<artifactId>commons-logging</artifactId>
118118
<version>1.2</version>
119119
</dependency>
120+
<!-- uk.org.lidalia:slf4j-test comes with 3.1 -->
121+
<dependency>
122+
<groupId>org.apache.commons</groupId>
123+
<artifactId>commons-lang3</artifactId>
124+
<version>3.3.2</version>
125+
</dependency>
126+
<!-- uk.org.lidalia:slf4j-test comes with 1.7.5 -->
127+
<dependency>
128+
<groupId>org.slf4j</groupId>
129+
<artifactId>slf4j-api</artifactId>
130+
<version>1.7.25</version>
131+
</dependency>
120132
</dependencies>
121133
</dependencyManagement>
122134

@@ -136,6 +148,7 @@
136148
<groupId>org.springframework.data</groupId>
137149
<artifactId>spring-data-commons</artifactId>
138150
</dependency>
151+
139152
<dependency>
140153
<groupId>org.hibernate</groupId>
141154
<artifactId>hibernate-validator</artifactId>
@@ -265,7 +278,7 @@
265278
<header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header>
266279
<properties>
267280
<owner>spring-data-dynamodb</owner>
268-
<email>https://github.com/derjust/spring-data-dynamodb</email>
281+
<email>https://github.com/spring-data-dynamodb/spring-data-dynamodb</email>
269282
</properties>
270283
<excludes>
271284
<exclude>**/README.md</exclude>
@@ -488,6 +501,7 @@
488501
<artifactId>maven-failsafe-plugin</artifactId>
489502
<configuration>
490503
<systemPropertyVariables>
504+
<sqlite4java.library.path>${project.build.directory}/lib</sqlite4java.library.path>
491505
<dynamodb.port>${dynamodblocal.port}</dynamodb.port>
492506
</systemPropertyVariables>
493507
</configuration>
@@ -505,10 +519,10 @@
505519
</build>
506520

507521
<scm>
508-
<url>https://github.com/derjust/spring-data-dynamodb</url>
509-
<connection>scm:git:ssh://github.com/derjust/spring-data-dynamodb.git</connection>
510-
<developerConnection>scm:git:ssh://git@github.com/derjust/spring-data-dynamodb.git</developerConnection>
511-
<tag>HEAD</tag>
522+
<url>https://github.com/spring-data-dynamodb/spring-data-dynamodb</url>
523+
<connection>scm:git:ssh://github.com/spring-data-dynamodb/spring-data-dynamodb.git</connection>
524+
<developerConnection>scm:git:ssh://git@github.com/spring-data-dynamodb/spring-data-dynamodb.git</developerConnection>
525+
<tag>v5.0.2</tag>
512526
</scm>
513527

514528
<repositories>
@@ -718,13 +732,13 @@
718732
</contributors>
719733

720734

721-
<distributionManagement>
735+
<distributionManagement><!--
722736
<relocation>
723737
<groupId>com.github.spring-data-dynamodb</groupId>
724-
</relocation>
738+
</relocation>-->
725739
<site>
726740
<id>website</id>
727-
<url>https://github.com/derjust/spring-data-dynamodb/</url>
741+
<url>https://github.com/spring-data-dynamodb/spring-data-dynamodb/</url>
728742
</site>
729743
<snapshotRepository>
730744
<id>ossrh</id>
@@ -735,11 +749,17 @@
735749
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
736750
</repository>
737751
</distributionManagement>
752+
738753
<issueManagement>
739754
<system>GitHub</system>
740-
<url>https://github.com/derjust/spring-data-dynamodb/issues</url>
755+
<url>https://github.com/spring-data-dynamodb/spring-data-dynamodb/issues</url>
741756
</issueManagement>
742757

758+
<ciManagement>
759+
<system>Travis CI</system>
760+
<url>https://travis-ci.org/spring-data-dynamodb/spring-data-dynamodb</url>
761+
</ciManagement>
762+
743763

744764
<reporting>
745765
<plugins>
@@ -760,6 +780,33 @@
760780
<artifactId>maven-project-info-reports-plugin</artifactId>
761781
<version>2.9</version>
762782
</plugin>
783+
<plugin>
784+
<groupId>org.apache.maven.plugins</groupId>
785+
<artifactId>maven-javadoc-plugin</artifactId>
786+
<version>3.0.0</version>
787+
<reportSets>
788+
<reportSet>
789+
<id>default</id>
790+
<reports>
791+
<report>javadoc</report>
792+
</reports>
793+
</reportSet>
794+
</reportSets>
795+
</plugin>
796+
<plugin>
797+
<groupId>org.apache.maven.plugins</groupId>
798+
<artifactId>maven-checkstyle-plugin</artifactId>
799+
<configuration>
800+
<configLocation>checkstyle.xml</configLocation>
801+
</configuration>
802+
</plugin>
803+
<plugin>
804+
<groupId>org.apache.maven.plugins</groupId>
805+
<artifactId>maven-surefire-report-plugin</artifactId>
806+
<version>2.20.1</version>
807+
<configuration>
808+
</configuration>
809+
</plugin>
763810
</plugins>
764811
</reporting>
765812

‎src/changes/changes.xml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
3-
Copyright © 2013 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
3+
Copyright © 2018 spring-data-dynamodb (https://github.com/spring-data-dynamodb/spring-data-dynamodb)
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
2323
<author email="zeeman@zeeman.de">derjust</author>
2424
</properties>
2525
<body>
26-
<release version="5.0.2" date="" description="Maintenance release">
26+
<release version="5.0.2" date="2018-03-05" description="Maintenance release">
2727
<action dev="vitolimandibhrata" issue="40" type="add" date="2017-01-07">
2828
Added support for Auditing
2929
</action>
@@ -45,6 +45,9 @@
4545
<action dev="derjust" issue="118" type="fix" date="2018-02-01">
4646
Handle hash key properties with different column name (attribute name) properly
4747
</action>
48+
<action dev="derjust" issue="46" type="fix" date="2018-02-27">
49+
deleteBy...And... is not deleting records in Dynamo
50+
</action>
4851
<action dev="derjust" type="add" issue="136">
4952
Transfer to spring-data-dynamodb organization
5053
</action>

‎src/main/java/org/socialsignin/spring/data/dynamodb/config/AbstractDynamoDBConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © 2013 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
2+
* Copyright © 2018 spring-data-dynamodb (https://github.com/spring-data-dynamodb/spring-data-dynamodb)
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.

‎src/main/java/org/socialsignin/spring/data/dynamodb/config/BeanNames.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © 2013 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
2+
* Copyright © 2018 spring-data-dynamodb (https://github.com/spring-data-dynamodb/spring-data-dynamodb)
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.

‎src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingBeanDefinitionParser.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © 2013 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
2+
* Copyright © 2018 spring-data-dynamodb (https://github.com/spring-data-dynamodb/spring-data-dynamodb)
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.

‎src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrar.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © 2013 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
2+
* Copyright © 2018 spring-data-dynamodb (https://github.com/spring-data-dynamodb/spring-data-dynamodb)
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)