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 2014/09/08 15:41:19 UTC

svn commit: r1623397 - in /syncope/trunk: ./ installer/src/main/resources/izpack/install.xml pom.xml

Author: ilgrosso
Date: Mon Sep  8 13:41:19 2014
New Revision: 1623397

URL: http://svn.apache.org/r1623397
Log:
[SYNCOPE-143] Merge from 1_2_X

Modified:
    syncope/trunk/   (props changed)
    syncope/trunk/installer/src/main/resources/izpack/install.xml
    syncope/trunk/pom.xml

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_2_X:r1623358-1623396

Modified: syncope/trunk/installer/src/main/resources/izpack/install.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/installer/src/main/resources/izpack/install.xml?rev=1623397&r1=1623396&r2=1623397&view=diff
==============================================================================
--- syncope/trunk/installer/src/main/resources/izpack/install.xml (original)
+++ syncope/trunk/installer/src/main/resources/izpack/install.xml Mon Sep  8 13:41:19 2014
@@ -45,16 +45,10 @@ under the License.
     <modifier key="headingBackgroundColor" value="0x00ffffff"/>
     <modifier key="headingPanelCounter" value="progressbar"/>
     <modifier key="headingPanelCounterPos" value="inNavigationPanel"/>
-    <laf name="substance">
-      <os family="windows" />
-      <os family="unix" />
-      <param name="variant" value="metouia" />
-    </laf>
   </guiprefs>
   
   <locale>
     <langpack iso3="eng"/>
-    <!--<langpack iso3="ita"/>-->
   </locale>
   
   <variables>

Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1623397&r1=1623396&r2=1623397&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Mon Sep  8 13:41:19 2014
@@ -366,7 +366,7 @@ under the License.
     <highlightjs.version>8.0</highlightjs.version>
     <codemirror.version>3.23</codemirror.version>
 
-    <izpack.version>5.0.0-rc2</izpack.version>
+    <izpack.version>5.0.0-rc3</izpack.version>
     <maven-invoker.version>2.1.1</maven-invoker.version>
     
     <jdeb.version>1.3</jdeb.version>