Author: massi
Date: Fri Aug 29 14:23:16 2014
New Revision: 1621312
URL: http://svn.apache.org/r1621312
Log:
merge from branch
Modified:
syncope/trunk/ (props changed)
syncope/trunk/installer/pom.xml
syncope/trunk/installer/src/main/resources/izpack/install.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_2_X:r1621305-1621311
Modified: syncope/trunk/installer/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/installer/pom.xml?rev=1621312&r1=1621311&r2=1621312&view=diff
==============================================================================
--- syncope/trunk/installer/pom.xml (original)
+++ syncope/trunk/installer/pom.xml Fri Aug 29 14:23:16 2014
@@ -118,6 +118,7 @@ under the License.
<directory>..</directory>
<includes>
<include>LICENSE</include>
+ <include>NOTICE</include>
</includes>
</resource>
</resources>
@@ -166,7 +167,7 @@ under the License.
<resources>
<resource>
- <directory>..</directory>
+ <directory>../legal_ext</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>LICENSE</include>
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=1621312&r1=1621311&r2=1621312&view=diff
==============================================================================
--- syncope/trunk/installer/src/main/resources/izpack/install.xml (original)
+++ syncope/trunk/installer/src/main/resources/izpack/install.xml Fri Aug 29
14:23:16 2014
@@ -24,7 +24,7 @@ under the License.
http://izpack.org/schema/5.0/izpack-installation-5.0.xsd";>
<info>
- <appname>Apache Syncope Installer</appname>
+ <appname>Apache Syncope</appname>
<appversion>@{syncope.version}</appversion>
<url>http://syncope.apache.org</url>
<authors>
