Author: ilgrosso
Date: Mon Sep 15 15:52:03 2014
New Revision: 1625088
URL: http://svn.apache.org/r1625088
Log:
Merge from 1_2_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/core/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_2_X:r1625051-1625087
Modified: syncope/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/pom.xml?rev=1625088&r1=1625087&r2=1625088&view=diff
==============================================================================
--- syncope/trunk/core/pom.xml (original)
+++ syncope/trunk/core/pom.xml Mon Sep 15 15:52:03 2014
@@ -1180,7 +1180,7 @@ under the License.
<container>
<containerId>glassfish4x</containerId>
<zipUrlInstaller>
-
<url>http://download.java.net/glassfish/4.0/release/glassfish-4.0.zip</url>
+
<url>http://download.java.net/glassfish/4.1/release/glassfish-4.1.zip</url>
<downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
<extractDir>${project.build.directory}/cargo/extract</extractDir>
</zipUrlInstaller>
