Merge pull request #487 from hazendaz/master

Reworking builds

Author: hazendaz

.travis.yml

@@ -1,18 +1,15 @@
 language: java
 sudo: false
+
 jdk:
   - oraclejdk8
   - oraclejdk7
   - openjdk7
   - openjdk6
-after_success:
-  - "mvn clean"
-  - "git clone -b travis `git config --get remote.origin.url` target/travis"
-  - "mvn deploy -Dmaven.test.skip=true --settings target/travis/settings.xml"
 
-branches:
-  except:
-    - travis
+after_success:
+  - chmod -R 777 ./travis/after_success.sh
+  - ./travis/after_success.sh
 
 env:
   global:

README.md

@@ -2,6 +2,8 @@ MYBATIS Data Mapper Framework
 =============================
 
 [![Build Status](https://travis-ci.org/mybatis/mybatis-3.svg?branch=master)](https://travis-ci.org/mybatis/mybatis-3)
+[![Coverage Status](https://coveralls.io/repos/mybatis/mybatis-3/badge.svg?branch=master&service=github)](https://coveralls.io/github/mybatis/mybatis-3?branch=master)
+[![Dependency Status](https://www.versioneye.com/user/projects/56199c04a193340f320005d3/badge.svg?style=flat)](https://www.versioneye.com/user/projects/56199c04a193340f320005d3)
 [![Maven central](https://maven-badges.herokuapp.com/maven-central/org.mybatis/mybatis/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.mybatis/mybatis)
 [![Apache 2](http://img.shields.io/badge/license-Apache%202-red.svg)](http://www.apache.org/licenses/LICENSE-2.0)
 

pom.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright 2009-2015 the original author or authors.
 
@@ -20,7 +20,8 @@
   <parent>
     <groupId>org.mybatis</groupId>
     <artifactId>mybatis-parent</artifactId>
-    <version>25</version>
+    <version>26-SNAPSHOT</version>
+    <relativePath />
   </parent>
 
   <artifactId>mybatis</artifactId>
@@ -137,7 +138,7 @@
     <dependency>
       <groupId>ognl</groupId>
       <artifactId>ognl</artifactId>
-      <version>3.0.11</version>
+      <version>3.1</version>
       <scope>compile</scope>
       <optional>true</optional>
       <exclusions>
@@ -172,6 +173,7 @@
       <version>1.2.17</version>
       <optional>true</optional>
     </dependency>
+    <!-- Don't upgrade to 2.4+ until mybatis switches to java 7 -->
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
@@ -201,7 +203,7 @@
     <dependency>
       <groupId>org.hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
-      <version>2.3.2</version>
+      <version>2.3.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>

src/test/java/org/apache/ibatis/type/JdbcTypeTest.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2015 the original author or authors.
+ *    Copyright 2009-2015 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

travis/after_success.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# Get Project Repo
+mybatis_repo=$(git config --get remote.origin.url 2>&1)
+echo "Repo detected: ${mybatis_repo}"
+ 
+# Get the Java version.
+# Java 1.5 will give 15.
+# Java 1.6 will give 16.
+# Java 1.7 will give 17.
+# Java 1.8 will give 18.
+VER=`java -version 2>&1 | sed 's/java version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q'`
+echo "Java detected: ${VER}"
+
+# We build for several JDKs on Travis.
+# Some actions, like analyzing the code (Coveralls) and uploading
+# artifacts on a Maven repository, should only be made for one version.
+ 
+# If the version is 1.6, then perform the following actions.
+# 1. Upload artifacts to Sonatype.
+# 2. Use -q option to only display Maven errors and warnings.
+# 3. Use --settings to force the usage of our "settings.xml" file.
+
+# If the version is 1.7, then perform the following actions.
+# 1. Notify Coveralls.
+# 2. Deploy site
+# 3. Use -q option to only display Maven errors and warnings.
+
+if [ "$mybatis_repo" == "https://github.com/mybatis/mybatis-3.git" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
+  if [ $VER == "16" ]; then
+    mvn clean deploy -q --settings ./travis/settings.xml
+    echo -e "Successfully deployed SNAPSHOT artifacts to Sonatype under Travis job ${TRAVIS_JOB_NUMBER}"
+  elif [ $VER == "17" ]; then
+    mvn clean test jacoco:report coveralls:report -q
+    echo -e "Successfully ran coveralls under Travis job ${TRAVIS_JOB_NUMBER}"
+	# various issues exist currently in building this so comment for now
+	# mvn site site:deploy -q
+	# echo -e "Successfully deploy site under Travis job ${TRAVIS_JOB_NUMBER}"
+  fi
+else
+  echo "Travis build skipped"
+fi

travis/settings.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
+  <servers>
+    <server>
+      <id>ossrh</id>
+      <username>${env.CI_DEPLOY_USERNAME}</username>
+      <password>${env.CI_DEPLOY_PASSWORD}</password>
+    </server>
+    <server>
+      <id>gh-pages</id>
+      <username>git</username>
+      <password>${env.CI_SITE_PASSWORD}</password>
+    </server>
+  </servers>
+</settings>