Skip to content

Commit

Permalink
Merge branch 'master' into feature/readme
Browse files Browse the repository at this point in the history
  • Loading branch information
whiskeysierra committed Apr 12, 2016
2 parents 1b74af4 + d67d46d commit b09a9c8
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 7 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,3 @@

### Maven ###
target/

.java-version
1 change: 1 addition & 0 deletions .java-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.7
16 changes: 16 additions & 0 deletions BUILD.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Build

## Dependencies

- [jEnv](http://www.jenv.be/)
- OpenJDK 1.7
- OpenJDK 1.8

## Run tests

./test.sh

## Release

./release.sh

6 changes: 1 addition & 5 deletions release.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
#!/usr/bin/env bash
#!/bin/sh

set -e

mvn scm:check-local-modification

# test
mvn dependency:tree clean test -Pjdk7,-jdk8
mvn dependency:tree clean test -Pjdk8,-jdk7

# release
mvn versions:set
git add pom.xml
Expand Down
19 changes: 19 additions & 0 deletions test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/sh

set -e

rollback() {
jenv local 1.7
}

trap rollback EXIT INT TERM

# test
jenv local 1.7
mvn dependency:tree clean test

jenv local 1.8
mvn dependency:tree clean test

jenv local 1.8
mvn dependency:tree clean test -P jdk7,-jdk8

0 comments on commit b09a9c8

Please sign in to comment.