Author: ilgrosso
Date: Tue Sep 2 14:23:31 2014
New Revision: 1622017
URL: http://svn.apache.org/r1622017
Log:
Merge from 1_2_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/installer/pom.xml
syncope/trunk/src/site/xdoc/downloads.xml
syncope/trunk/src/site/xdoc/release-process.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_2_X:r1622000-1622016
Modified: syncope/trunk/installer/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/installer/pom.xml?rev=1622017&r1=1622016&r2=1622017&view=diff
==============================================================================
--- syncope/trunk/installer/pom.xml (original)
+++ syncope/trunk/installer/pom.xml Tue Sep 2 14:23:31 2014
@@ -158,7 +158,7 @@ under the License.
<configuration>
<baseDir>${staging.dir}</baseDir>
<installFile>${staging.dir}/install.xml</installFile>
-
<output>${project.build.directory}/${project.artifactId}.jar</output>
+ <classifier>uber</classifier>
</configuration>
</execution>
</executions>
Modified: syncope/trunk/src/site/xdoc/downloads.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/src/site/xdoc/downloads.xml?rev=1622017&r1=1622016&r2=1622017&view=diff
==============================================================================
--- syncope/trunk/src/site/xdoc/downloads.xml (original)
+++ syncope/trunk/src/site/xdoc/downloads.xml Tue Sep 2 14:23:31 2014
@@ -95,12 +95,12 @@ under the License.
</tr>
<tr>
<td>
- <a
href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.0-M1/syncope-installer-1.2.0-M1.jar";>syncope-installer-1.2.0-M1.jar</a>
+ <a
href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.0-M1/syncope-installer-1.2.0-M1-uber.jar";>syncope-installer-1.2.0-M1.jar</a>
</td>
<td>
- <a
href="http://www.apache.org/dist/syncope/1.2.0-M1/syncope-installer-1.2.0-M1.jar.asc";>asc</a>
- <a
href="http://www.apache.org/dist/syncope/1.2.0-M1/syncope-installer-1.2.0-M1.jar.md5";>md5</a>
- <a
href="http://www.apache.org/dist/syncope/1.2.0-M1/syncope-installer-1.2.0-M1.jar.sha1";>sha1</a>
+ <a
href="http://www.apache.org/dist/syncope/1.2.0-M1/syncope-installer-1.2.0-M1-uber.jar.asc";>asc</a>
+ <a
href="http://www.apache.org/dist/syncope/1.2.0-M1/syncope-installer-1.2.0-M1-uber.jar.md5";>md5</a>
+ <a
href="http://www.apache.org/dist/syncope/1.2.0-M1/syncope-installer-1.2.0-M1-uber.jar.sha1";>sha1</a>
</td>
</tr>
<tr>
Modified: syncope/trunk/src/site/xdoc/release-process.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/src/site/xdoc/release-process.xml?rev=1622017&r1=1622016&r2=1622017&view=diff
==============================================================================
--- syncope/trunk/src/site/xdoc/release-process.xml (original)
+++ syncope/trunk/src/site/xdoc/release-process.xml Tue Sep 2 14:23:31 2014
@@ -238,8 +238,8 @@ cp $SYNCOPE_RELEASE_DIR/target/syncope-*
cp
$SYNCOPE_RELEASE_DIR/standalone/target/syncope-standalone-*-distribution.zip .
cp
$SYNCOPE_RELEASE_DIR/standalone/target/syncope-standalone-*-distribution.zip.asc
.
# only for 1_2_X
-cp $SYNCOPE_RELEASE_DIR/installer/target/syncope-installer-*.jar .
-cp $SYNCOPE_RELEASE_DIR/installer/target/syncope-installer-*.jar.asc .
+cp $SYNCOPE_RELEASE_DIR/installer/target/syncope-installer-*-uber.jar .
+cp $SYNCOPE_RELEASE_DIR/installer/target/syncope-installer-*-uber.jar.asc .
cp $SYNCOPE_RELEASE_DIR/deb/core/target/apache-syncope-*.deb .
cp $SYNCOPE_RELEASE_DIR/deb/core/target/apache-syncope-*.deb.asc .
cp $SYNCOPE_RELEASE_DIR/deb/console/target/apache-syncope-console-*.deb .
