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/01 15:40:34 UTC
svn commit: r1621774 - in /syncope/trunk: ./ pom.xml src/site/site.xml
src/site/xdoc/downloads.xml src/site/xdoc/release-process.xml
Author: ilgrosso
Date: Mon Sep 1 13:40:34 2014
New Revision: 1621774
URL: http://svn.apache.org/r1621774
Log:
Merge from 1_2_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/pom.xml
syncope/trunk/src/site/site.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:r1621744-1621773
Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1621774&r1=1621773&r2=1621774&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Mon Sep 1 13:40:34 2014
@@ -1569,7 +1569,7 @@ under the License.
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<configuration>
- <destDir>apidocs/1.1</destDir>
+ <destDir>apidocs/1.2</destDir>
<detectLinks>true</detectLinks>
<detectJavaApiLink>true</detectJavaApiLink>
<links>
Modified: syncope/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/src/site/site.xml?rev=1621774&r1=1621773&r2=1621774&view=diff
==============================================================================
--- syncope/trunk/src/site/site.xml (original)
+++ syncope/trunk/src/site/site.xml Mon Sep 1 13:40:34 2014
@@ -66,7 +66,9 @@ under the License.
<item name="Architecture" href="architecture.html"/>
<item name="Downloads" href="downloads.html"/>
<item name="Security Advisories" href="security.html"/>
- <item name="API Docs" href="apidocs/1.1/index.html">
+ <item name="References" href="apidocs/1.2/index.html">
+ <item name="REST 1.2" href="rest/1.2/index.html"/>
+ <item name="Javadocs 1.2" href="apidocs/1.2/index.html"/>
<item name="Javadocs 1.1" href="apidocs/1.1/index.html"/>
<item name="Javadocs 1.0" href="apidocs/1.0/index.html"/>
</item>
Modified: syncope/trunk/src/site/xdoc/downloads.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/src/site/xdoc/downloads.xml?rev=1621774&r1=1621773&r2=1621774&view=diff
==============================================================================
--- syncope/trunk/src/site/xdoc/downloads.xml (original)
+++ syncope/trunk/src/site/xdoc/downloads.xml Mon Sep 1 13:40:34 2014
@@ -38,25 +38,94 @@ under the License.
See the <tt>LICENSE</tt> and <tt>NOTICE</tt> files included in each artifact for additional license
information.
</p>
- <p>Use the links below to download a source distribution of Apache Syncope.
+ <p>Use the links below to download a distribution of Apache Syncope.
It is good practice to <a href="#Verifying_Releases">verify the integrity</a> of the distribution files.
</p>
- <div style="border: 1px solid black; border-radius: 15px;padding:5px;background-color:#F5F5F5;margin-top:5px;margin-bottom:10px;">
- <div style="margin-left:20px;">
- <p>
- <b>Note</b> that the preferred way to work with Apache Syncope is to
- <a class="externalLink" href="https://cwiki.apache.org/confluence/display/SYNCOPE/Create+a+new+Syncope+project">generate a Maven project</a>
- starting from published archetype.
- </p>
- <p>
- If evaluating Apache Syncope, the simplest way is via the
- <a class="externalLink" href="https://cwiki.apache.org/confluence/display/SYNCOPE/Run+Syncope+standalone+distribution">standalone distribution</a>.
- </p>
- </div>
- </div>
+ <subsection name="Which distribution to download?">
+ <ul>
+ <li>Evaluating? <a class="externalLink" href="https://cwiki.apache.org/confluence/display/SYNCOPE/Run+Syncope+standalone+distribution">Standalone distribution</a></li>
+ <li>Building your own IdM solution?
+ <ul>
+ <li>GUI lover?
+ <a class="externalLink" href="https://cwiki.apache.org/confluence/display/SYNCOPE/Install+Syncope+from+installer">Use the installer</a>
+ </li>
+ <li>Prefer CLI?
+ <a class="externalLink" href="https://cwiki.apache.org/confluence/display/SYNCOPE/Create+a+new+Syncope+project">Generate a Maven project</a>
+ </li>
+ </ul>
+ </li>
+ <li>Deploying on Debian GNU / Linux - Ubuntu?</li>
+ </ul>
+ </subsection>
</section>
<section name="Current Releases">
+ <subsection name="1.2.0-M1 Intermezzo">
+ <p>Release date: ???</p>
+ <p>
+ <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Intermezzo">Release notes</a>
+ </p>
+ <table>
+ <thead>
+ <tr>
+ <th>Artifact</th>
+ <th>Signatures</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>
+ <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.0-M1/syncope-1.2.0-M1-source-release.zip">syncope-1.2.0-M1-source-release.zip</a>
+ </td>
+ <td>
+ <a href="http://www.apache.org/dist/syncope/1.2.0-M1/syncope-1.2.0-M1-source-release.zip.asc">asc</a>
+ <a href="http://www.apache.org/dist/syncope/1.2.0-M1/syncope-1.2.0-M1-source-release.zip.md5">md5</a>
+ <a href="http://www.apache.org/dist/syncope/1.2.0-M1/syncope-1.2.0-M1-source-release.zip.sha1">sha1</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.0-M1/syncope-standalone-1.2.0-M1-distribution.zip">syncope-standalone-1.2.0-M1-distribution.zip</a>
+ </td>
+ <td>
+ <a href="http://www.apache.org/dist/syncope/1.2.0-M1/syncope-standalone-1.2.0-M1-distribution.zip.asc">asc</a>
+ <a href="http://www.apache.org/dist/syncope/1.2.0-M1/syncope-standalone-1.2.0-M1-distribution.zip.md5">md5</a>
+ <a href="http://www.apache.org/dist/syncope/1.2.0-M1/syncope-standalone-1.2.0-M1-distribution.zip.sha1">sha1</a>
+ </td>
+ </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>
+ </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>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.0-M1/apache-syncope-1.2.0-M1.deb">apache-syncope-1.2.0-M1.deb</a>
+ </td>
+ <td>
+ <a href="http://www.apache.org/dist/syncope/1.2.0-M1/apache-syncope-1.2.0-M1.deb.asc">asc</a>
+ <a href="http://www.apache.org/dist/syncope/1.2.0-M1/apache-syncope-1.2.0-M1.deb.md5">md5</a>
+ <a href="http://www.apache.org/dist/syncope/1.2.0-M1/apache-syncope-1.2.0-M1.deb.sha1">sha1</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="http://www.apache.org/dyn/closer.cgi/syncope/1.2.0-M1/apache-syncope-console-1.2.0-M1.deb">apache-syncope-console-1.2.0-M1.deb</a>
+ </td>
+ <td>
+ <a href="http://www.apache.org/dist/syncope/1.2.0-M1/apache-syncope-console-1.2.0-M1.deb.asc">asc</a>
+ <a href="http://www.apache.org/dist/syncope/1.2.0-M1/apache-syncope-console-1.2.0-M1.deb.md5">md5</a>
+ <a href="http://www.apache.org/dist/syncope/1.2.0-M1/apache-syncope-console-1.2.0-M1.deb.sha1">sha1</a>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </subsection>
<subsection name="1.1.8 Ad libitum">
<p>Release date: Jul 3rd, 2014</p>
<p>
Modified: syncope/trunk/src/site/xdoc/release-process.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/src/site/xdoc/release-process.xml?rev=1621774&r1=1621773&r2=1621774&view=diff
==============================================================================
--- syncope/trunk/src/site/xdoc/release-process.xml (original)
+++ syncope/trunk/src/site/xdoc/release-process.xml Mon Sep 1 13:40:34 2014
@@ -224,56 +224,69 @@ cd <version>]]></source>
<subsection name="Perform the release">
<ol>
<li>
+ <b>Staging artifacts</b>
+ <source><![CDATA[
+# let $SYNCOPE_RELEASE_DIR be the directory from which you have launched release:prepare above
+
+svn co https://dist.apache.org/repos/dist/dev/syncope syncope-dist-dev
+cd syncope-dist-dev
+mkdir <version>
+cd <version>
+
+cp $SYNCOPE_RELEASE_DIR/target/syncope-*-source-release.zip .
+cp $SYNCOPE_RELEASE_DIR/target/syncope-*-source-release.zip.asc .
+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/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 .
+cp $SYNCOPE_RELEASE_DIR/deb/console/target/apache-syncope-console-*.deb.asc .
+
+for file in `find . -name '*.deb' -or -name '*.jar' -or -name '*.zip'`; do
+ openssl md5 $file | sed 's/.*= //' > $file.md5
+ openssl sha1 $file | sed 's/.*= //' > $file.sha1
+done
+
+cd ..
+svn add <version>
+svn commit -m "Staging artifacts for <version> vote"]]></source>
+ </li>
+ <li>
<b>Staging site</b>
- <ul>
- <li>1_1_X
- <source><![CDATA[
+ <source><![CDATA[
svn checkout https://svn.apache.org/repos/asf/syncope/site/ site
svn checkout https://svn.apache.org/repos/asf/syncope/tags/syncope-<version> syncope-<version>
cd syncope-<version>
-mvn clean install
+mvn -P skipTests
mvn -P site -Dsite.deploymentBaseUrl=file:///<absolute path to ../site/<version>
+cd common
+mvn -P offline-doc
cd ../site/<version>
-rm -rf syncope-console syncope-client syncope-archetype syncope-core syncope-build-tools syncope-common syncope-standalone project-reports.html apidocs/1.html
+rm -rf syncope-* project-reports.html apidocs/1.html
+# if releasing from 1_2_X
+mkdir rest
+cp -r ../syncope-<version>/common/target/generated/wadl/ rest/1.2
+
cd ..
svn add <version>
-svn copy apidocs/1.0 <version>/apidocs/
-svn commit -m "Staging site for release"]]></source>
- </li>
- <li>1_0_X
- <source><![CDATA[
-svn checkout https://svn.apache.org/repos/asf/syncope/site/ site
-svn checkout https://svn.apache.org/repos/asf/syncope/tags/syncope-<version> syncope-<version>
-
-cd syncope-<version>
-mvn clean install
-mvn -f parent/pom.xml -P site -Dsite.deploymentBaseUrl=file:///<absolute path to ../site/<version>
-
-cd ../site/<version>
-rm -rf images css syncope-console syncope-client syncope-archetype syncope-core syncope-build-tools syncope-hibernate-enhancer syncope-quality project-reports.html apidocs/1.html
-
-cd ../..
-svn checkout https://svn.apache.org/repos/asf/syncope/branches/1_1_X syncope-1_1_X
-
-cd syncope-1_1_X
-mvn -P site -Dsite.deploymentBaseUrl=file:///<absolute path to ../site/<version>
-cd ../site/<version>
-rm -rf syncope-console syncope-client syncope-archetype syncope-core syncope-build-tools syncope-common syncope-standalone project-reports.html apidocs/1.html apidocs/1.1
-
-cd ..
-svn add <version>
+svn copy apidocs/1.0 <version>/apidocs/
+# if releasing from 1_2_X
svn copy apidocs/1.1 <version>/apidocs/
+# if releasing from 1_1_X
+svn copy apidocs/1.2 <version>/apidocs/
+svn copy rest <version>/rest
+
svn commit -m "Staging site for release"]]></source>
- </li>
- </ul>
</li>
<li>
- From the directory where you have launched <code>release:prepare</code> execute (this step will create a maven
- staging repository):
+ From <code>$SYNCOPE_RELEASE_DIR</code> execute (this step will create a maven staging repository):
<source>mvn -P apache-release release:perform [-Duser.name=<your_apache_uid>]</source>
<p>
@@ -353,12 +366,12 @@ https://svn.apache.org/repos/asf/syncope
List of changes:
https://svn.apache.org/repos/asf/syncope/tags/<version>/CHANGES
+Staging artifacts:
+https://dist.apache.org/repos/dist/dev/syncope/<version>
+
Maven staging repo:
https://repository.apache.org/content/repositories/orgapachesyncope-YYY/
-Source release (checksums and signatures are available at the same location):
-https://repository.apache.org/content/repositories/orgapachesyncope-YYY/org/apache/syncope/syncope/<version>/syncope-<version>-source-release.zip
-
Staging site:
http://syncope.apache.org/<version>/
@@ -452,36 +465,11 @@ Best regards.
<li>
Add the distribution artifacts to the distribution area (execute the commands below preferably on
<code>people.apache.org</code>)
- <ul>
- <li>1_1_X
- <source><![CDATA[
-svn co https://dist.apache.org/repos/dist/dev/syncope syncope-dist-dev
-cd syncope-dist-dev
-
-wget -e robots=off -nH --cut-dirs=7 -np --no-check-certificate -m -A *.zip* -R .asc.sha1,.asc.md5 \
-https://repository.apache.org/content/repositories/releases/org/apache/syncope/syncope/<version>/
-wget -e robots=off -nH --cut-dirs=7 -np --no-check-certificate -m -A *.zip* -R .asc.sha1,.asc.md5 \
-https://repository.apache.org/content/repositories/releases/org/apache/syncope/syncope-standalone/<version>/
-
-rm <version>/syncope-*asc.asc
-
-svn add <version>
-svn commit -m "Promoting the voted release artifacts to dist-dev area"
-
+ <source><![CDATA[
svn mkdir -m "Creating root dir for new release" https://dist.apache.org/repos/dist/release/syncope/<version>
-svn mv -m "Moving the voted release artifacts to dist/release (source)" \
-https://dist.apache.org/repos/dist/dev/syncope/<version>/syncope-<version>-source-release.zip \
-https://dist.apache.org/repos/dist/dev/syncope/<version>/syncope-<version>-source-release.zip.asc \
-https://dist.apache.org/repos/dist/dev/syncope/<version>/syncope-<version>-source-release.zip.md5 \
-https://dist.apache.org/repos/dist/dev/syncope/<version>/syncope-<version>-source-release.zip.sha1 \
-https://dist.apache.org/repos/dist/release/syncope/<version>
-
-svn mv -m "Moving the voted release artifacts to dist/release (standalone)" \
-https://dist.apache.org/repos/dist/dev/syncope/<version>/syncope-standalone-<version>-distribution.zip \
-https://dist.apache.org/repos/dist/dev/syncope/<version>/syncope-standalone-<version>-distribution.zip.asc \
-https://dist.apache.org/repos/dist/dev/syncope/<version>/syncope-standalone-<version>-distribution.zip.md5 \
-https://dist.apache.org/repos/dist/dev/syncope/<version>/syncope-standalone-<version>-distribution.zip.sha1 \
+svn mv -m "Moving the voted release artifacts to dist/release" \
+https://dist.apache.org/repos/dist/dev/syncope/<version>
https://dist.apache.org/repos/dist/release/syncope/<version>
svn rm -m "Cleaning up older releases" https://dist.apache.org/repos/dist/dev/syncope/<version>
@@ -490,33 +478,6 @@ svn co https://dist.apache.org/repos/dis
cd syncope-dist-release
svn rm <any older release artifact (if present)>
svn commit -m "Cleaning up older releases"]]></source>
- </li>
- <li>1_0_X
- <source><![CDATA[
-svn co https://dist.apache.org/repos/dist/dev/syncope syncope-dist-dev
-cd syncope-dist-dev
-
-wget -e robots=off -nH --cut-dirs=7 -np --no-check-certificate -m -A *.zip* -R .asc.sha1,.asc.md5 \
-https://repository.apache.org/content/repositories/releases/org/apache/syncope/syncope-root/<version>/
-
-rm <version>/syncope-*asc.asc
-
-svn add <version>
-svn commit -m "Promoting the voted release artifacts to dist-dev area"
-
-svn mv -m "Moving the voted release artifacts to dist/release" \
-https://dist.apache.org/repos/dist/dev/syncope/<version>/syncope-<version>-source-release.zip \
-https://dist.apache.org/repos/dist/dev/syncope/<version>/syncope-<version>-source-release.zip.asc \
-https://dist.apache.org/repos/dist/dev/syncope/<version>/syncope-<version>-source-release.zip.md5 \
-https://dist.apache.org/repos/dist/dev/syncope/<version>/syncope-<version>-source-release.zip.sha1 \
-https://dist.apache.org/repos/dist/release/syncope/<version>
-
-svn co https://dist.apache.org/repos/dist/release/syncope syncope-dist-release
-cd syncope-dist-release
-svn rm <any older release artifact (if present)>;
-svn commit -m "Cleaning up older releases"]]></source>
- </li>
- </ul>
</li>
<li>
Add appropriate release notes to