Skip to content

Commit

Permalink
Jodd v3.8 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
igr committed Oct 25, 2016
1 parent dc45a24 commit 7287186
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 13 deletions.
13 changes: 8 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Some tools and utility modules are:
+ `jodd-servlet` with many servlet utilities, including nice tag library.
+ `jodd-http`, tiny HTTP client.

and some micro frameworks:
and some micro-frameworks:

+ `jodd-madvoc` - slick MVC framework.
+ `jodd-petite` - pragmatic DI container.
Expand Down Expand Up @@ -75,7 +75,7 @@ Simply clone **Jodd** Git repo:

### Compile and test, build jars

You can build the project with:
You can build the Jodd project with:

gradlew build

Expand All @@ -86,11 +86,14 @@ To skip the tests (for faster build), execute:

### Build full release with reports

To generate full release, including running integration tests and generating various reports:
To generate _full release_, including running integration tests and generating various reports,
you need [Docker](https://www.docker.com/) v1.12+.

gradlew release
docker-compose -f etc/docker-compose.yml up
gradlew clean release

For integration tests you will need also to set up databases named: 'jodd-test' on local MySql (access: root/root!) and PostgreSQL (postgres/root!).
Integration tests requires some infrastructure (like databases), hence Docker is
used.

### Install Jodd into your local Maven

Expand Down
22 changes: 14 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ description = '''
simple, but not simpler.
'''

version = '3.8.0-' + date()
//version = '3.7.1'
//version = '3.8.0-' + date()
version = '3.8.0'

// --- properties -------------------------------------------------------------

Expand All @@ -52,8 +52,8 @@ ext {

lib = [
mail: [
'javax.mail:javax.mail-api:1.5.+',
'com.sun.mail:javax.mail:1.5.+'
'javax.mail:javax.mail-api:1.5.6',
'com.sun.mail:javax.mail:1.5.6'
],
activation: 'javax.activation:activation:1.1.1',
servlet: 'javax.servlet:javax.servlet-api:3.0.1',
Expand Down Expand Up @@ -185,8 +185,14 @@ configure(javaModules()) {

// compile

sourceCompatibility = 1.8
targetCompatibility = 1.8
compileJava {
sourceCompatibility = '1.8'
targetCompatibility = '1.8'
}

if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
throw new GradleException("This build must be run with Java 8.")
}

tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
Expand Down Expand Up @@ -287,7 +293,7 @@ configure(javaModules()) {
encoding = 'UTF-8'
docEncoding = 'UTF-8'
stylesheetFile = file('src/main/javadoc/jodd.css')
source = '1.7'
source = '1.8'
failOnError = false
}
}
Expand Down Expand Up @@ -508,7 +514,7 @@ gradle.taskGraph.whenReady { taskGraph ->
println " You are about to run the 'release' task for Jodd project!"
println " This task builds distribution artifacts, but also runs"
println " integration tests and generates reports (javadoc, coverage...)"
println " For running integration tests you need databases running;"
println " For running integration tests you need infrastructure running;"
println " please find more information here: http://jodd.org/code.html"
println ""
println " Usually, you don't need to run this task. If you want to build"
Expand Down

0 comments on commit 7287186

Please sign in to comment.