[1/2] marmotta git commit: Revert "upgraded jackson"

[wi...@apache.org]

Repository: marmotta
Updated Branches:
  refs/heads/develop d9e0231f3 -> 059cea529


Revert "upgraded jackson"

This reverts commit d9e0231f3d820d355edc2ca1d4d577d0c4f565da.


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/40bb19c6
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/40bb19c6
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/40bb19c6

Branch: refs/heads/develop
Commit: 40bb19c619b45d5ff0fb49712760ef255053a9e9
Parents: d9e0231
Author: Sergio Fern�ndez <wi...@apache.org>
Authored: Tue Jul 26 13:21:14 2016 +0200
Committer: Sergio Fern�ndez <wi...@apache.org>
Committed: Tue Jul 26 13:21:14 2016 +0200

----------------------------------------------------------------------
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/40bb19c6/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 1d52f8d..134cf55 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -51,7 +51,7 @@
         <mysql.version>5.1.21</mysql.version>
         <jetty.version>9.2.1.v20140609</jetty.version>
         <resteasy.version>3.0.18.Final</resteasy.version>
-        <jackson.version>2.8.1</jackson.version>
+        <jackson.version>2.3.3</jackson.version>
         <titan.version>0.4.2</titan.version>
         <accumulograph.version>0.2.1</accumulograph.version>
         <jax.doclets.version>0.10.1</jax.doclets.version>

[2/2] marmotta git commit: trying to enable travis ci for building marmotta

[wi...@apache.org]

trying to enable travis ci for building marmotta


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/059cea52
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/059cea52
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/059cea52

Branch: refs/heads/develop
Commit: 059cea52936f31bbac3b49fe4d1a85eaf196c01c
Parents: 40bb19c
Author: Sergio Fern�ndez <wi...@apache.org>
Authored: Tue Jul 26 13:21:54 2016 +0200
Committer: Sergio Fern�ndez <wi...@apache.org>
Committed: Tue Jul 26 13:21:54 2016 +0200

----------------------------------------------------------------------
 .travis.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/059cea52/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..78c6aec
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,15 @@
+language: java
+
+sudo: false
+
+branches:
+  only:
+  - master
+  - develop
+
+jdk:
+- openjdk7
+- openjdk8
+
+script: mvn clean install
+