Skip to content

Commit b6e9075

Browse files
christophstroblodrotbohm
authored andcommitted
DATAREDIS-419 - Move project build to Maven.
- Introduce Maven pom.xml. - Moved Asciidoctor files to src/main/asciidoc. - Moved notice.txt etc. to src/main/resources. - Add logback.xml - Update Makefile to use maven and pick build profiles. - Update template.mf to pick up versions in pom.xml - Add build matrix for spring versions to .travis.yml - Use container based travis infrastructure. - Update readme.
1 parent a446dd3 commit b6e9075

31 files changed

+327
-188
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ bin
44
build
55
.gradle
66
.springBeans
7-
pom.xml
87
*.iml
98
*.ipr
109
*.iws

.travis.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,16 @@ language: java
22
jdk:
33
- oraclejdk7
44
- oraclejdk8
5-
script: make test
5+
env:
6+
matrix:
7+
- PROFILE=ci
8+
- PROFILE=spring41-next
9+
- PROFILE=spring42
10+
- PROFILE=spring42-next
11+
- PROFILE=spring43-next
12+
cache:
13+
directories:
14+
- $HOME/.m2
15+
sudo: false
16+
install: true
17+
script: travis_wait make test SPRING_PROFILE=${PROFILE}

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
REDIS_VERSION:=3.0.2
15+
REDIS_VERSION:=3.0.7
16+
SPRING_PROFILE?=ci
1617

1718
#######
1819
# Redis
@@ -95,5 +96,5 @@ stop: redis-stop sentinel-stop
9596
test:
9697
$(MAKE) start
9798
sleep 2
98-
-$(PWD)/gradlew clean build -DrunLongTests=true -S
99+
mvn clean install -DrunLongTests=true -P$(SPRING_PROFILE)
99100
$(MAKE) stop

README.md

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -89,21 +89,22 @@ List<Person> peopleOnSecondFloor = listOps.range("users:floor:2", 0, -1);
8989

9090
# Building
9191

92-
Spring Data Redis uses Gradle as its build system. To build the system simply run:
92+
Spring Data Redis uses Maven as its build system.
93+
Running the tests requires you to have a RedisServer running at its default port. Using the `-D runLongTests=true` option executes additional Pub/Sub test.
9394

94-
gradlew
95+
```bash
96+
mvn clean install
97+
```
9598

96-
from the project root folder. This will compile the sources, run the tests and create the artifacts.
99+
You can alternatively use the provided `Makefile` which runs the build plus downloads and spins up the following environment:
97100

98-
To generate IDE-specific files, use
101+
* 1 Single Node
102+
* HA Redis (1 Master, 2 Slaves, 3 Sentinels).
103+
* Redis Cluster (3 Masters, 1 Slave)
99104

100-
gradlew eclipse
101-
102-
or
103-
104-
gradlew idea
105-
106-
depending on your editor.
105+
```bash
106+
make test
107+
```
107108

108109
# Contributing
109110

-2.77 KB
Binary file not shown.

docs/src/api/overview.html

Lines changed: 0 additions & 24 deletions
This file was deleted.

docs/src/api/spring-javadoc.css

Lines changed: 0 additions & 48 deletions
This file was deleted.

docs/src/reference/docbook/index.xml

Lines changed: 0 additions & 79 deletions
This file was deleted.

0 commit comments

Comments
 (0)