You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/04/23 16:47:52 UTC
svn commit: r1470986 - in /syncope/branches/1_1_X: ./ .travis.yml pom.xml
Author: ilgrosso
Date: Tue Apr 23 14:47:52 2013
New Revision: 1470986
URL: http://svn.apache.org/r1470986
Log:
Merge from 1_0_X
Modified:
syncope/branches/1_1_X/ (props changed)
syncope/branches/1_1_X/.travis.yml
syncope/branches/1_1_X/pom.xml
Propchange: syncope/branches/1_1_X/
------------------------------------------------------------------------------
Merged /syncope/branches/1_0_X:r1469877-1470983
Modified: syncope/branches/1_1_X/.travis.yml
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/.travis.yml?rev=1470986&r1=1470985&r2=1470986&view=diff
==============================================================================
--- syncope/branches/1_1_X/.travis.yml (original)
+++ syncope/branches/1_1_X/.travis.yml Tue Apr 23 14:47:52 2013
@@ -20,11 +20,6 @@ jdk:
install: mvn --show-version --errors -P skipTests
#invoker.streamLogs: we cannot access to log files through Travis web ui, so display everything in the console
script: mvn --show-version --errors clean install -Dinvoker.streamLogs=true
-branches:
- only:
- - trunk
- - 1_1_X
- - 1_0_X
notifications:
email:
- dev@syncope.apache.org
Modified: syncope/branches/1_1_X/pom.xml
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/pom.xml?rev=1470986&r1=1470985&r2=1470986&view=diff
==============================================================================
--- syncope/branches/1_1_X/pom.xml (original)
+++ syncope/branches/1_1_X/pom.xml Tue Apr 23 14:47:52 2013
@@ -306,7 +306,7 @@ under the License.
<velocity.version>1.7</velocity.version>
<quartz.version>2.1.7</quartz.version>
- <openjpa.version>2.2.1</openjpa.version>
+ <openjpa.version>2.2.2</openjpa.version>
<bval.version>0.5</bval.version>
<cocoon.version>3.0.0-alpha-3</cocoon.version>